You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@db.apache.org by bp...@apache.org on 2017/10/01 16:35:06 UTC

svn commit: r1018974 [1/6] - in /websites/production/db/content/derby: ./ dev/ integrate/ manuals/ papers/ papers/DerbyTut/ releases/

Author: bpendleton
Date: Sun Oct  1 16:35:06 2017
New Revision: 1018974

Log:
DERBY-6965: Community page has outdated testing instructions

This change updates derby_comm.html so that it instructs
developers to use 'ant junitreport' to run tests of their change.

It also points to the wiki for further resources.

Modified:
    websites/production/db/content/derby/DerbyBugGuidelines.html
    websites/production/db/content/derby/derby_charter.html
    websites/production/db/content/derby/derby_comm.html
    websites/production/db/content/derby/derby_downloads.html
    websites/production/db/content/derby/derby_mail.html
    websites/production/db/content/derby/derby_proposal.html
    websites/production/db/content/derby/derby_tests.html
    websites/production/db/content/derby/dev/derby_source.html
    websites/production/db/content/derby/faq.html
    websites/production/db/content/derby/index.html
    websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.html
    websites/production/db/content/derby/integrate/JPOX_Derby.html
    websites/production/db/content/derby/integrate/JPetStoreGeronimo.html
    websites/production/db/content/derby/integrate/SQuirreL_Derby.html
    websites/production/db/content/derby/integrate/db_ddlutils.html
    websites/production/db/content/derby/integrate/db_torque.html
    websites/production/db/content/derby/integrate/derby_plugin_info.html
    websites/production/db/content/derby/integrate/index.html
    websites/production/db/content/derby/license.html
    websites/production/db/content/derby/linkmap.html
    websites/production/db/content/derby/logo.html
    websites/production/db/content/derby/manuals/dita.html
    websites/production/db/content/derby/manuals/docscheck.html
    websites/production/db/content/derby/manuals/docsfaq.html
    websites/production/db/content/derby/manuals/guidelines.html
    websites/production/db/content/derby/manuals/index.html
    websites/production/db/content/derby/manuals/messages.html
    websites/production/db/content/derby/papers/ApacheCon.html
    websites/production/db/content/derby/papers/DerbyClientSpec.html
    websites/production/db/content/derby/papers/DerbyTut/embedded_intro.html
    websites/production/db/content/derby/papers/DerbyTut/ij_intro.html
    websites/production/db/content/derby/papers/DerbyTut/index.html
    websites/production/db/content/derby/papers/DerbyTut/install_software.html
    websites/production/db/content/derby/papers/DerbyTut/ns_intro.html
    websites/production/db/content/derby/papers/Intersect-design.html
    websites/production/db/content/derby/papers/JDBCImplementation.html
    websites/production/db/content/derby/papers/btree_package.html
    websites/production/db/content/derby/papers/derby_arch.html
    websites/production/db/content/derby/papers/derby_htw.html
    websites/production/db/content/derby/papers/derby_web.html
    websites/production/db/content/derby/papers/fortune_tut.html
    websites/production/db/content/derby/papers/index.html
    websites/production/db/content/derby/papers/logformats.html
    websites/production/db/content/derby/papers/optimizer.html
    websites/production/db/content/derby/papers/pageformats.html
    websites/production/db/content/derby/papers/recovery.html
    websites/production/db/content/derby/papers/versionupgrade.html
    websites/production/db/content/derby/quick_start.html
    websites/production/db/content/derby/releases/release-10.0.2.1.html
    websites/production/db/content/derby/releases/release-10.1.1.0.html
    websites/production/db/content/derby/releases/release-10.1.2.1.html
    websites/production/db/content/derby/releases/release-10.1.3.1.html
    websites/production/db/content/derby/releases/release-10.10.1.1.html
    websites/production/db/content/derby/releases/release-10.10.2.0.html
    websites/production/db/content/derby/releases/release-10.11.1.1.html
    websites/production/db/content/derby/releases/release-10.2.1.6.html
    websites/production/db/content/derby/releases/release-10.2.2.0.html
    websites/production/db/content/derby/releases/release-10.3.3.0.html
    websites/production/db/content/derby/releases/release-10.4.1.3.html
    websites/production/db/content/derby/releases/release-10.4.2.0.html
    websites/production/db/content/derby/releases/release-10.5.1.1.html
    websites/production/db/content/derby/releases/release-10.5.3.0.html
    websites/production/db/content/derby/releases/release-10.6.1.0.html
    websites/production/db/content/derby/releases/release-10.6.2.1.html
    websites/production/db/content/derby/releases/release-10.7.1.1.html
    websites/production/db/content/derby/releases/release-10.8.1.2.html
    websites/production/db/content/derby/releases/release-10.8.2.2.html
    websites/production/db/content/derby/releases/release-10.8.3.0.html
    websites/production/db/content/derby/releases/release-10.9.1.0.html

Modified: websites/production/db/content/derby/DerbyBugGuidelines.html
==============================================================================
--- websites/production/db/content/derby/DerbyBugGuidelines.html (original)
+++ websites/production/db/content/derby/DerbyBugGuidelines.html Sun Oct  1 16:35:06 2017
@@ -3,9 +3,8 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
-<meta name="generator" content="">
 <meta name="" content="">
 <meta name="GENERATOR" content="">
 <meta name="CREATED" content="">
@@ -180,6 +179,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Tips For Filing Apache Derby Bugs</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -208,13 +208,14 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-<a name="N10035"></a><a name="Introduction"></a>
+</div>
+<a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>This document is suggested reading for anyone who wants to enter a bug against Derby. It explains how to go about filing a bug and what information you should provide to make the bug entry useful to a developer attempting to fix it. For information on filing other issues in Jira (enhancements, improvements etc.) and for a detailed description of some of the less understood concepts and data fields in Jira, please read the document titled <em>Apache Derby Issues in Jira</em> [<a href="binaries/FilingDerbyIssuesInJira.doc">doc</a>, <a href="binaries/FilingDerbyIssuesInJira.pdf">PDF</a>].</p>
 <p>Derby issues are maintained at <a class="external" href="http://issues.apache.org/jira/browse/DERBY">http://issues.apache.org/jira/browse/DERBY</a>. Suggested actions to take before/while filing a bug are listed in the sections below.</p>
 </div>
-<a name="N1004C"></a><a name="Login+to+Jira%2FRequest+a+Jira+userid"></a>
+<a name="Login+to+Jira%2FRequest+a+Jira+userid"></a>
 <h2 class="boxed">Login to Jira/Request a Jira userid</h2>
 <div class="section">
 <p>You may access Jira at</p>
@@ -223,12 +224,12 @@ document.write("Last Published: " + docu
 </p>
 <p>If you do not have a userid, create one. A "Signup" link has been provided on the login page. There are 2 levels of access to Derby issues in Jira, "user" access and "developer" access. A "user" may open a bug but will not be able to edit/update/assign it. This requires "developer" privileges. If you think you will need to edit/update a bug entry, please send an email to <a class="external" href="mailto:derby-dev@db.apache.org">derby-dev@db.apache.org</a> requesting that you be added in to the "derby-developers" group in Jira.</p>
 </div>
-<a name="N1005C"></a><a name="Search+Jira+for+an+existing+bug+report"></a>
+<a name="Search+Jira+for+an+existing+bug+report"></a>
 <h2 class="boxed">Search Jira for an existing bug report</h2>
 <div class="section">
 <p>Before filing a new bug, it is recommended that you first search Jira to verify that it has not yet been reported. Jira offers various fields (and combinations thereof) that you can search on. You will probably benefit the most by searching on keywords that are relevant to the bug you are intending to report. For more details on how to search, see the document titled <a href="binaries/FilingDerbyIssuesInJira.doc">Filing Apache Derby Issues in Jira</a>.</p>
 </div>
-<a name="N10066"></a><a name="Post+your+bug+to+the+mailing+lists"></a>
+<a name="Post+your+bug+to+the+mailing+lists"></a>
 <h2 class="boxed">Post your bug to the mailing lists</h2>
 <div class="section">
 <p>If the bug you are intending to report is not already logged in Jira, it may be a good idea to post a query to the <a class="external" href="mailto:derby-user@db.apache.org">derby-user@db.apache.org</a> mail list asking the following:</p>
@@ -238,7 +239,7 @@ document.write("Last Published: " + docu
 <p>- if relevant, why you think the bug is a "blocker" (highest priority)</p>
 <p>Note: Posting to the mail lists should not be seen as an alternative to filing the bug in Jira. This step may be viewed as optional, however you should at least search Jira for an existing bug report.</p>
 </div>
-<a name="N1007A"></a><a name="File+your+bug"></a>
+<a name="File+your+bug"></a>
 <h2 class="boxed">File your bug</h2>
 <div class="section">
 <p>When you post a new bug to the mail lists, please pay attention to the following details that make it a "useful" post. These simple guidelines help avoid poorly filed/described bugs:</p>
@@ -249,7 +250,7 @@ document.write("Last Published: " + docu
 <p>- Include any relevant output from the derby.log file. If this information is too confusing for you to understand and the file isn't too big, you may want to attach it to your bug entry</p>
 <p>Provide error information such as SQLSTATE and nested exceptions reported by Derby. Usually, Derby would generate chained exceptions (nested), so you should write applications that traverse the chains with the getNextException() method call in your exception reporting code. If you are not using a JDBC application, you should report the series of nested exceptions (if generated) displayed on your error console.</p>
 </div>
-<a name="N1008C"></a><a name="Set+appropriate+special+%22flags%22"></a>
+<a name="Set+appropriate+special+%22flags%22"></a>
 <h2 class="boxed">Set appropriate special "flags"</h2>
 <div class="section">
 <p>There are 4 special flags that can be set; each has its own effect and use.</p>
@@ -268,13 +269,13 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-<a name="N100A2"></a><a name="%22Close%22+your+bug+once+it+is+%22Resolved%22"></a>
+<a name="%22Close%22+your+bug+once+it+is+%22Resolved%22"></a>
 <h2 class="boxed">"Close" your bug once it is "Resolved"</h2>
 <div class="section">
 <p>As the submitter of a bug, it is your responsibility to verify a bug fix and "Close" the issue. Once fixed, a developer marks the bug as "Resolved" with a resolution of "Fixed". You need to then go back and "Close" the issue, provided you agree the bug has been fixed. If the resolution of the bug is something other than "Fixed" and you disagree, or the fix submitted did not really resolve the issue, you need to "Reopen" the issue. Please add relevant comments in Jira when doing these operations. See the document titled <a href="binaries/FilingDerbyIssuesInJira.doc">Filing Apache Derby Issues in Jira</a> for additional details.</p>
 <p>Note that once you file your bug, Jira will generate a notification email to the derby-dev@db.apache.org mail list.</p>
 </div>
-<a name="N100AE"></a><a name="For+more+information"></a>
+<a name="For+more+information"></a>
 <h2 class="boxed">For more information</h2>
 <div class="section">
 <p>You may want to read the document titled <a href="binaries/FilingDerbyIssuesInJira.doc">Filing Apache Derby Issues in Jira</a> for additional details on the following concepts:</p>

Modified: websites/production/db/content/derby/derby_charter.html
==============================================================================
--- websites/production/db/content/derby/derby_charter.html (original)
+++ websites/production/db/content/derby/derby_charter.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby Project Charter</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby Project Charter</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -215,10 +216,11 @@ document.write("Last Published: " + docu
 <a href="#Derby+History">Derby History</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Derby+Project+Charter"></a>
+<a name="Derby+Project+Charter"></a>
 <h2 class="boxed">Derby Project Charter</h2>
 <div class="section">
 <p>
@@ -237,7 +239,7 @@ The Derby project develops open source d
 <li>Secure</li>
 
 </ul>
-<a name="N10027"></a><a name="Database+Technology"></a>
+<a name="Database+Technology"></a>
 <h3 class="boxed">Database Technology</h3>
 <p>
   Database technology is defined as software that processes data related 
@@ -245,26 +247,26 @@ The Derby project develops open source d
   Data requests include data definition, data modification, and data retrieval.
   The Derby project does not develop database GUI tools or IDEs.
   </p>
-<a name="N10030"></a><a name="Pure+Java"></a>
+<a name="Pure+Java"></a>
 <h3 class="boxed">Pure Java</h3>
 <p>
   Derby technology is written in Java in order to take advantage of Java&rsquo;s write 
   once, run anywhere promise. 
   Java platforms such as OSGi, J2ME, J2SE and J2EE are supported as appropriate.
   </p>
-<a name="N10039"></a><a name="Easy+to+Use"></a>
+<a name="Easy+to+Use"></a>
 <h3 class="boxed">Easy to Use</h3>
 <p>
   Derby intends to be easy for software developers to use and to impose no administrative burden on end users.
   </p>
-<a name="N10042"></a><a name="Small+Footprint"></a>
+<a name="Small+Footprint"></a>
 <h3 class="boxed">Small Footprint</h3>
 <p>
   Derby provides significant
   functionality, fits in a small code size footprint, and uses runtime 
   resources efficiently.
   </p>
-<a name="N1004B"></a><a name="Standards+based"></a>
+<a name="Standards+based"></a>
 <h3 class="boxed">Standards based</h3>
 <p>
   Derby adheres to database standards such as JDBC
@@ -275,7 +277,7 @@ The Derby project develops open source d
   and online backups.
   It also means that developers can migrate easily to other databases later on.
   </p>
-<a name="N10054"></a><a name="Secure"></a>
+<a name="Secure"></a>
 <h3 class="boxed">Secure</h3>
 <p>
   Derby provides secure data management appropriate to the environment 
@@ -287,16 +289,16 @@ The Derby project develops open source d
 </div>
 
 
-<a name="N1005E"></a><a name="Derby+Technologies"></a>
+<a name="Derby+Technologies"></a>
 <h2 class="boxed">Derby Technologies</h2>
 <div class="section">
-<a name="N10063"></a><a name="Derby+embedded+database+engine"></a>
+<a name="Derby+embedded+database+engine"></a>
 <h3 class="boxed">Derby embedded database engine</h3>
 <p>
    The core Derby technology is a fully functional, embedded database engine.
    The engine can be programmed using SQL over JDBC. 
   </p>
-<a name="N1006C"></a><a name="Derby+network+server"></a>
+<a name="Derby+network+server"></a>
 <h3 class="boxed">Derby network server</h3>
 <p>
    The Derby network server provides traditional client/server access to the Derby engine.
@@ -305,7 +307,7 @@ The Derby project develops open source d
    The network server supports connections from networked JDBC, 
    ODBC/CLI, Perl, and PHP clients.
   </p>
-<a name="N10075"></a><a name="Database+Utilities"></a>
+<a name="Database+Utilities"></a>
 <h3 class="boxed">Database Utilities</h3>
 <ul>
    
@@ -327,7 +329,7 @@ The Derby project develops open source d
 </div>
 
 
-<a name="N10091"></a><a name="Derby+History"></a>
+<a name="Derby+History"></a>
 <h2 class="boxed">Derby History</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/derby_comm.html
==============================================================================
--- websites/production/db/content/derby/derby_comm.html (original)
+++ websites/production/db/content/derby/derby_comm.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Get Involved!</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Get Involved!</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -191,6 +192,7 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
 
@@ -200,7 +202,7 @@ We invite you to participate as a user o
 </p>
 
 
-<a name="N10010"></a><a name="Provide+Feedback"></a>
+<a name="Provide+Feedback"></a>
 <h2 class="boxed">Provide Feedback</h2>
 <div class="section">
 <p>
@@ -242,7 +244,7 @@ so send the community your feedback:
 </div>
 
 
-<a name="N10041"></a><a name="Use+the+Derby+Communication+Channels"></a>
+<a name="Use+the+Derby+Communication+Channels"></a>
 <h2 class="boxed">Use the Derby Communication Channels</h2>
 <div class="section">
 <p>
@@ -282,7 +284,7 @@ understanding that is developed.
 </div>
 
 
-<a name="N1005C"></a><a name="Understand+How+Development+Works+at+Apache"></a>
+<a name="Understand+How+Development+Works+at+Apache"></a>
 <h2 class="boxed">Understand How Development Works at Apache</h2>
 <div class="section">
 <p>
@@ -376,7 +378,7 @@ next section is tailored specifically fo
 </div>
 
 
-<a name="N100B4"></a><a name="Contribute+Code+or+Documentation"></a>
+<a name="Contribute+Code+or+Documentation"></a>
 <h2 class="boxed">Contribute Code or Documentation</h2>
 <div class="section">
 <p>
@@ -420,6 +422,12 @@ is just a sampling of the topics covered
       Contributor Checklist</a>: Tips for developers contributing code to Derby.
  </li>
  
+<li>
+  
+<a class="external" href="http://wiki.apache.org/db-derby/DerbyJUnitTesting">Derby
+      JUnit Testing</a> and <a class="external" href="http://wiki.apache.org/db-derby/DerbyTopLevelJunitTests">Derby Top-Level Tests</a>: Information on running the various Derby test suites.
+ </li>
+ 
 <li> 
 <a class="external" href="http://wiki.apache.org/db-derby/DerbyCommitProcess">Derby
        Commit Process</a>: How a change to Derby actually gets committed.</li>
@@ -474,20 +482,18 @@ svn propset svn:eol-style native java/en
 <li> 
 
 <p>
-Run the tests (to be safe, run derbyall).
-(Be sure to set your CLASSPATH env var to include the trunk/classes dir.)
+Run the tests (for more details, see the wiki links above).
 </p> 
 
 
 <pre class="code">
 ant all
-cd &lt;a temp/test dir&gt;
-java org.apache.derbyTesting.functionTests.harness.RunSuite derbyall
+ant junitreport
 </pre>
 
 
 <p> 
-Resolve any test failures (update relevant ../functionTests/master/*.out files).
+Resolve any test failures.
 </p> 
 
 

Modified: websites/production/db/content/derby/derby_downloads.html
==============================================================================
--- websites/production/db/content/derby/derby_downloads.html (original)
+++ websites/production/db/content/derby/derby_downloads.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Downloads</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -157,6 +157,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Downloads</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -179,10 +180,11 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
 
-<a name="N1000D"></a><a name="For+Java+8+and+Higher"></a>
+<a name="For+Java+8+and+Higher"></a>
 <h2 class="boxed">For Java 8 and Higher</h2>
 <div class="section">
 <ul>
@@ -196,7 +198,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N1001E"></a><a name="For+Java+6+and+Higher"></a>
+<a name="For+Java+6+and+Higher"></a>
 <h2 class="boxed">For Java 6 and Higher</h2>
 <div class="section">
 <ul>
@@ -215,7 +217,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N10036"></a><a name="For+Java+1.4+and+Higher"></a>
+<a name="For+Java+1.4+and+Higher"></a>
 <h2 class="boxed">For Java 1.4 and Higher</h2>
 <div class="section">
 <ul>
@@ -294,7 +296,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N100A2"></a><a name="For+Java+1.3+and+Higher"></a>
+<a name="For+Java+1.3+and+Higher"></a>
 <h2 class="boxed">For Java 1.3 and Higher</h2>
 <div class="section">
 <ul>
@@ -328,7 +330,7 @@ document.write("Last Published: " + docu
 </div>
 
 
-<a name="N100CF"></a><a name="Deprecated+Releases"></a>
+<a name="Deprecated+Releases"></a>
 <h2 class="boxed">Deprecated Releases</h2>
 <div class="section">
 <p>
@@ -353,7 +355,7 @@ of changes to Derby:
 </div>
 
 
-<a name="N100EF"></a><a name="Change+History"></a>
+<a name="Change+History"></a>
 <h2 class="boxed">Change History</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/derby_mail.html
==============================================================================
--- websites/production/db/content/derby/derby_mail.html (original)
+++ websites/production/db/content/derby/derby_mail.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Mailing Lists</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Mailing Lists</h1>
+<div id="front-matter"></div>
 
 
 <p>

Modified: websites/production/db/content/derby/derby_proposal.html
==============================================================================
--- websites/production/db/content/derby/derby_proposal.html (original)
+++ websites/production/db/content/derby/derby_proposal.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Proposal for Derby: an Apache Database Sub-Project</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -172,6 +172,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Proposal for Derby: an Apache Database Sub-Project</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -211,6 +212,7 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
 <p>
@@ -218,7 +220,7 @@ document.write("Last Published: " + docu
 </p>
 
 
-<a name="N10011"></a><a name="Section+0+%3A+Rationale"></a>
+<a name="Section+0+%3A+Rationale"></a>
 <h2 class="boxed">Section 0 : Rationale</h2>
 <div class="section">
 <p>Databases are a core component of nearly all applications. But
@@ -276,7 +278,7 @@ remote access to the database when desir
 </div>
 
 
-<a name="N10033"></a><a name="Section+0.1+%3A+Criteria"></a>
+<a name="Section+0.1+%3A+Criteria"></a>
 <h2 class="boxed">Section 0.1 : Criteria</h2>
 <div class="section">
 <p>We feel that this project has an excellent chance for success
@@ -336,7 +338,7 @@ as measured by the following aspects:</p
 </div>
 
 
-<a name="N10063"></a><a name="Section+1+%3A+Scope+of+the+Project"></a>
+<a name="Section+1+%3A+Scope+of+the+Project"></a>
 <h2 class="boxed">Section 1 : Scope of the Project</h2>
 <div class="section">
 <p>There are multiple goals for this Apache project:</p>
@@ -386,7 +388,7 @@ as measured by the following aspects:</p
 </div>
 
 
-<a name="N1008E"></a><a name="Section+2+%3A+Initial+Source"></a>
+<a name="Section+2+%3A+Initial+Source"></a>
 <h2 class="boxed">Section 2 : Initial Source</h2>
 <div class="section">
 <p>The initial code base from which to create this project is
@@ -547,10 +549,10 @@ project will be licensed under the ASF l
 </div>
 
 
-<a name="N10118"></a><a name="Section+3+%3A+ASF+Resources+to+be+Created"></a>
+<a name="Section+3+%3A+ASF+Resources+to+be+Created"></a>
 <h2 class="boxed">Section 3 : ASF Resources to be Created</h2>
 <div class="section">
-<a name="N1011E"></a><a name="Section+3.1+%3A+Mailing+Lists"></a>
+<a name="Section+3.1+%3A+Mailing+Lists"></a>
 <h3 class="boxed">Section 3.1 : Mailing Lists</h3>
 <ul>
     
@@ -564,14 +566,14 @@ project will be licensed under the ASF l
 </li>
   
 </ul>
-<a name="N10132"></a><a name="Section+3.2+%3A+CVS+Repositories"></a>
+<a name="Section+3.2+%3A+CVS+Repositories"></a>
 <h3 class="boxed">Section 3.2 : CVS Repositories</h3>
 <ul>
     
 <li>incubator-derby</li>
   
 </ul>
-<a name="N1013F"></a><a name="Section+3.3+%3A+Bugzilla+or+possibly+Jira"></a>
+<a name="Section+3.3+%3A+Bugzilla+or+possibly+Jira"></a>
 <h3 class="boxed">Section 3.3 : Bugzilla or possibly Jira</h3>
 <ul>
     
@@ -581,7 +583,7 @@ project will be licensed under the ASF l
 </div>
 
   
-<a name="N1014D"></a><a name="Section+4+%3A+Initial+Set+of+Committers"></a>
+<a name="Section+4+%3A+Initial+Set+of+Committers"></a>
 <h2 class="boxed">Section 4 : Initial Set of Committers</h2>
 <div class="section">
 <p>All committers will sign and submit a Contributors License
@@ -615,7 +617,7 @@ project will be licensed under the ASF l
 </ul>
 </div>
  
-<a name="N1017E"></a><a name="Section+5+%3A+Apache+Sponsoring+Individuals"></a>
+<a name="Section+5+%3A+Apache+Sponsoring+Individuals"></a>
 <h2 class="boxed">Section 5 : Apache Sponsoring Individuals</h2>
 <div class="section">
 <ul>
@@ -625,7 +627,7 @@ project will be licensed under the ASF l
 </ul>
 </div>
  
-<a name="N1018B"></a><a name="Section+6+%3A+Incubation+Exit+Criteria"></a>
+<a name="Section+6+%3A+Incubation+Exit+Criteria"></a>
 <h2 class="boxed">Section 6 : Incubation Exit Criteria</h2>
 <div class="section">
 <p>We feel this project should exit the incubator to join the

Modified: websites/production/db/content/derby/derby_tests.html
==============================================================================
--- websites/production/db/content/derby/derby_tests.html (original)
+++ websites/production/db/content/derby/derby_tests.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Tests</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Tests</h1>
+<div id="front-matter"></div>
 
 
 

Modified: websites/production/db/content/derby/dev/derby_source.html
==============================================================================
--- websites/production/db/content/derby/dev/derby_source.html (original)
+++ websites/production/db/content/derby/dev/derby_source.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby: Source Code</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby: Source Code</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -202,9 +203,10 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 
 
-<a name="N1000D"></a><a name="Intended+Audience"></a>
+<a name="Intended+Audience"></a>
 <h2 class="boxed">Intended Audience</h2>
 <div class="section">
 <p>
@@ -216,7 +218,7 @@ The official Derby releases are availabl
 </div>
 
 
-<a name="N1001B"></a><a name="Derby+source+code"></a>
+<a name="Derby+source+code"></a>
 <h2 class="boxed">Derby source code</h2>
 <div class="section">
 <p>
@@ -230,7 +232,7 @@ First, download and install Subversion f
 <a class="external" href="http://subversion.apache.org/">http://subversion.apache.org/</a>
 
 </p>
-<a name="N1002F"></a><a name="Branches"></a>
+<a name="Branches"></a>
 <h3 class="boxed">Branches</h3>
 <p>
 Currently Derby has the following branches:
@@ -280,7 +282,7 @@ the 10.14 branch:
 </p>
 <pre class="code">svn co https://svn.apache.org/repos/asf/db/derby/code/branches/10.14/
 </pre>
-<a name="N1007D"></a><a name="Development+trunk"></a>
+<a name="Development+trunk"></a>
 <h3 class="boxed">Development trunk</h3>
 <p>
 Use the command shown below to check out the development trunk:
@@ -329,7 +331,7 @@ The alpha version tag explicitly disable
 </div>
 
 
-<a name="N100B1"></a><a name="How+to+build+Derby"></a>
+<a name="How+to+build+Derby"></a>
 <h2 class="boxed">How to build Derby</h2>
 <div class="section">
 <p>
@@ -340,11 +342,15 @@ at the root of the source code tree.
 </div>
 
 
-<a name="N100BF"></a><a name="How+to+test+Derby"></a>
+<a name="How+to+test+Derby"></a>
 <h2 class="boxed">How to test Derby</h2>
 <div class="section">
 <p>
-Instructions for testing Derby are in the source code tree in
+Most Derby tests are run using the JUnit testing tool. For details on how to run these tests, see <a class="external" href="http://wiki.apache.org/db-derby/DerbyTopLevelJunitTests">these instructions in the Derby wiki</a>
+
+</p>
+<p>
+Additional, and somewhat out-dated, instructions for testing Derby are in the source code tree in
 <a class="external" href="http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/README.htm?view=co">java/testing/README.htm</a>.
 </p>
 <p>
@@ -362,7 +368,7 @@ resources.
 </div>
 
 
-<a name="N100E6"></a><a name="How+to+submit+a+patch"></a>
+<a name="How+to+submit+a+patch"></a>
 <h2 class="boxed">How to submit a patch</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/faq.html
==============================================================================
--- websites/production/db/content/derby/faq.html (original)
+++ websites/production/db/content/derby/faq.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Frequently Asked Questions</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -172,12 +172,10 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Frequently Asked Questions</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
-<a href="#Questions">Questions</a>
-<ul class="minitoc">
-<li>
 <a href="#legal">1. Legal</a>
 <ul class="minitoc">
 <li>
@@ -370,35 +368,23 @@ document.write("Last Published: " + docu
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 </div>
-<a name="N10008"></a><a name="Questions"></a>
-<h2 class="boxed">Questions</h2>
+</div>
+<a name="legal"></a>
+<h2 class="boxed">1. Legal</h2>
 <div class="section">
-<a name="N1000C"></a><a name="legal"></a>
-<h3 class="boxed">1. Legal</h3>
-<a name="N10010"></a><a name="derby_license"></a>
-<h4 class="faq">1.1. 
+<a name="derby_license"></a>
+<h3 class="boxed">1.1. 
         What License is Derby under? (Quick Answer: ASL 2.0)
-      </h4>
-<div align="right">
-<a href="#derby_license-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p> Derby is available under the 
             <a href="license.html">Apache License, Version 2.0.</a>
         
 </p>
-</div>
-<a name="N1001C"></a><a name="derby_icla"></a>
-<h4 class="faq">1.2. 
+<a name="derby_icla"></a>
+<h3 class="boxed">1.2. 
         Who needs to file an Individual Contributor License Agreement (ICLA)?
-      </h4>
-<div align="right">
-<a href="#derby_icla-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
         The ASF <em>desires</em> contributors to submit an ICLA, but
         <em>requires</em> committers to do so.
@@ -414,16 +400,13 @@ document.write("Last Published: " + docu
         a Derby committer will likely ask you to submit an ICLA.
         </p>
 </div>
-<a name="N10032"></a><a name="general"></a>
-<h3 class="boxed">2. General</h3>
-<a name="N10036"></a><a name="faq_add"></a>
-<h4 class="faq">2.1. 
+<a name="general"></a>
+<h2 class="boxed">2. General</h2>
+<div class="section">
+<a name="faq_add"></a>
+<h3 class="boxed">2.1. 
         How can I add a new entry to the Derby FAQ?
-      </h4>
-<div align="right">
-<a href="#faq_add-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p> We welcome additions!
         Please add your new entry to 
         <a class="external" href="http://issues.apache.org/jira/browse/DERBY-232">DERBY-232</a>.
@@ -431,15 +414,10 @@ document.write("Last Published: " + docu
         <a class="external" href="http://issues.apache.org">Jira id</a>
          if you don't already have one.
         </p>
-</div>
-<a name="N10046"></a><a name="site_search"></a>
-<h4 class="faq">2.2. 
+<a name="site_search"></a>
+<h3 class="boxed">2.2. 
         How do I search the Derby site?
-      </h4>
-<div align="right">
-<a href="#site_search-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p> The left-hand menu on the Derby web site
            includes a search box that searches the
            entire db.apache.org web site; 
@@ -463,16 +441,13 @@ document.write("Last Published: " + docu
 "create table" site:db.apache.org/derby/docs/10.13
 </pre>
 </div>
-<a name="N10064"></a><a name="developers"></a>
-<h3 class="boxed">3. Developing Derby</h3>
-<a name="N10068"></a><a name="derby_source"></a>
-<h4 class="faq">3.1. 
+<a name="developers"></a>
+<h2 class="boxed">3. Developing Derby</h2>
+<div class="section">
+<a name="derby_source"></a>
+<h3 class="boxed">3.1. 
         Where is the Derby source code?
-      </h4>
-<div align="right">
-<a href="#derby_source-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p> The
 	<a href="dev/derby_source.html">Apache Derby: Source Code</a> page
 	provides instructions for checking out the Derby source code
@@ -491,15 +466,10 @@ document.write("Last Published: " + docu
         Information about web site source is covered in the
         <a href="papers/derby_web.html">Apache Derby Web Site</a> page.
         </p>
-</div>
-<a name="N10086"></a><a name="derby_internals"></a>
-<h4 class="faq">3.2. 
+<a name="derby_internals"></a>
+<h3 class="boxed">3.2. 
         Where can I read about Derby internals?
-      </h4>
-<div align="right">
-<a href="#derby_internals-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p> The
 	<a href="papers/index.html#Derby+Engine">Derby Engine</a>
         papers and the
@@ -509,29 +479,19 @@ document.write("Last Published: " + docu
 	<a href="derby_mail.html">derby-dev@db.apache.org</a>
 	mail list and post any questions you have.
         </p>
-</div>
-<a name="N1009A"></a><a name="derby_issues"></a>
-<h4 class="faq">3.3. 
+<a name="derby_issues"></a>
+<h3 class="boxed">3.3. 
         Where are Apache Derby bugs logged?
-      </h4>
-<div align="right">
-<a href="#derby_issues-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
 	Apache Derby uses 
 	<a href="DerbyBugGuidelines.html">Apache's Jira issue 
 	tracker</a> to track bugs.
 	</p>
-</div>
-<a name="N100A6"></a><a name="derby_update"></a>
-<h4 class="faq">3.4. 
+<a name="derby_update"></a>
+<h3 class="boxed">3.4. 
         Who can create a new Apache Derby issue?
-      </h4>
-<div align="right">
-<a href="#derby_update-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
         Anyone can browse Apache Derby issues. 
         To log new issues, 
@@ -542,44 +502,31 @@ document.write("Last Published: " + docu
         <a href="derby_mail.html">derby-dev@db.apache.org</a> and
          request that it be added to the derby-developers Jira list.
 	</p>
-</div>
-<a name="N100B6"></a><a name="derby_eclipse"></a>
-<h4 class="faq">3.5. 
+<a name="derby_eclipse"></a>
+<h3 class="boxed">3.5. 
         How do you build Derby using Eclipse or Netbeans?
-      </h4>
-<div align="right">
-<a href="#derby_eclipse-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>See the Eclipse and Netbeans instructions on the 
         <a class="external" href="http://wiki.apache.org/db-derby/BuildingDerby">BuildingDerby</a>
         Wiki page.
 	</p>
-</div>
-<a name="N100C2"></a><a name="derby_am"></a>
-<h4 class="faq">3.6. 
+<a name="derby_am"></a>
+<h3 class="boxed">3.6. 
        What does the "am" in org.apache.derby.client.am mean?
-      </h4>
-<div align="right">
-<a href="#derby_am-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>AM means "Abstract Machine". 
            The code in the client.am directory implements non-public JDBC
            interfaces that are
          <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-dev/200602.mbox/%3c43F4E9B5.5000708@Sourcery.Org%3e">independent of any specific protocol</a>.
 	</p>
 </div>
-<a name="N100CE"></a><a name="users_getstart"></a>
-<h3 class="boxed">4. Using Derby: Getting Started</h3>
-<a name="N100D2"></a><a name="derby_ask"></a>
-<h4 class="faq">4.1. 
+<a name="users_getstart"></a>
+<h2 class="boxed">4. Using Derby: Getting Started</h2>
+<div class="section">
+<a name="derby_ask"></a>
+<h3 class="boxed">4.1. 
         Where can I ask questions about how to use Derby?
-      </h4>
-<div align="right">
-<a href="#derby_ask-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
         Please post questions about how to use Derby to the
         <a href="derby_mail.html">derby-user@db.apache.org</a> mail list.
@@ -591,41 +538,26 @@ document.write("Last Published: " + docu
         And if the referenced post/page/documentation doesn't help, 
         feel free to ask for more help.
         </p>
-</div>
-<a name="N100DE"></a><a name="derby_jar"></a>
-<h4 class="faq">4.2. 
+<a name="derby_jar"></a>
+<h3 class="boxed">4.2. 
         Where can I download the Derby jar files?
-      </h4>
-<div align="right">
-<a href="#derby_jar-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
         You can download the Derby jar files 
 	from the <a href="derby_downloads.html">Derby Downloads</a> page.
 	</p>
-</div>
-<a name="N100EA"></a><a name="where_are_docs"></a>
-<h4 class="faq">4.3. 
+<a name="where_are_docs"></a>
+<h3 class="boxed">4.3. 
       Where can I find the Derby documentation?
-      </h4>
-<div align="right">
-<a href="#where_are_docs-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Derby documentation is available in PDF and HTML format from
 <a href="manuals/index.html">http://db.apache.org/derby/manuals/</a>.
       </p>
-</div>
-<a name="N100F6"></a><a name="pda"></a>
-<h4 class="faq">4.4. 
+<a name="pda"></a>
+<h3 class="boxed">4.4. 
       Can you run Derby on small devices?
-      </h4>
-<div align="right">
-<a href="#pda-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Starting in 10.1, Derby added support for
       J2ME/CDC/Foundation with JSR169 as the JDBC api. 
@@ -633,42 +565,27 @@ document.write("Last Published: " + docu
 <a href="http://db.apache.org/derby/docs/10.7/ref/rrefjdbcjsr169.html">Reference
       Guide</a>. Starting with 10.11, Derby added support for running on the small Java 8 compact profile 2 platform.
       </p>
-</div>
-<a name="N10102"></a><a name="derby_javax"></a>
-<h4 class="faq">4.5. 
+<a name="derby_javax"></a>
+<h3 class="boxed">4.5. 
       Can I use Derby on Java release X?
-      </h4>
-<div align="right">
-<a href="#derby_javax-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
         See the <a href="derby_downloads.html">Derby Downloads</a> page
         for the compatibility between Derby and Java versions.
       </p>
-</div>
-<a name="N1010E"></a><a name="in_memory"></a>
-<h4 class="faq">4.6. 
+<a name="in_memory"></a>
+<h3 class="boxed">4.6. 
       Does Derby have a mode that causes it to run entirely in memory?
-      </h4>
-<div align="right">
-<a href="#in_memory-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Of course! For more information,
       start <a class="external" href="http://wiki.apache.org/db-derby/InMemoryBackEndPrimer">
           here</a>.
       </p>
-</div>
-<a name="N1011A"></a><a name="derby_gui"></a>
-<h4 class="faq">4.7. 
+<a name="derby_gui"></a>
+<h3 class="boxed">4.7. 
       Does Derby have a GUI?
-      </h4>
-<div align="right">
-<a href="#derby_gui-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       No, Derby does not include a GUI. However,
       the web site includes a writeup on how to use
@@ -677,15 +594,10 @@ document.write("Last Published: " + docu
       <a class="external" href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
       Wiki page list other GUIs that work with Derby.
       </p>
-</div>
-<a name="N1012A"></a><a name="db_name"></a>
-<h4 class="faq">4.8. 
+<a name="db_name"></a>
+<h3 class="boxed">4.8. 
       How do you specify database location?
-      </h4>
-<div align="right">
-<a href="#db_name-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       You can specify a
       database name using an absolute or relative path.
@@ -695,29 +607,19 @@ document.write("Last Published: " + docu
       <a class="external" href="http://wiki.apache.org/db-derby/DatabaseNamesRelativeAbsolute">Derby
       Wiki</a>.
       </p>
-</div>
-<a name="N1013A"></a><a name="win_service"></a>
-<h4 class="faq">4.9. 
+<a name="win_service"></a>
+<h3 class="boxed">4.9. 
       Can you run Derby as a Windows service?
-      </h4>
-<div align="right">
-<a href="#win_service-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       The <a class="external" href="http://wiki.apache.org/db-derby/DerbyWindowsService">Derby
       Wiki</a> provides pointers to information on how to run Derby as a
       Windows service.
       </p>
-</div>
-<a name="N10146"></a><a name="derby_version"></a>
-<h4 class="faq">4.10. 
+<a name="derby_version"></a>
+<h3 class="boxed">4.10. 
       How do I find out which version of Derby I am using? 
-      </h4>
-<div align="right">
-<a href="#derby_version-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       You can use the sysinfo tool or the JDBC API to get version 
       information from your Derby installation. See the 
@@ -725,16 +627,13 @@ document.write("Last Published: " + docu
       wiki page</a> for more details. 
       </p>
 </div>
-<a name="N10152"></a><a name="users_sql"></a>
-<h3 class="boxed">5. Using Derby: SQL</h3>
-<a name="N10156"></a><a name="null_args"></a>
-<h4 class="faq">5.1. 
+<a name="users_sql"></a>
+<h2 class="boxed">5. Using Derby: SQL</h2>
+<div class="section">
+<a name="null_args"></a>
+<h3 class="boxed">5.1. 
       Why can't my SQL function/procedure pass a NULL INTEGER?
-      </h4>
-<div align="right">
-<a href="#null_args-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Either declare the function with
       RETURNS NULL ON NULL INPUT
@@ -742,15 +641,10 @@ document.write("Last Published: " + docu
       <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200602.mbox/%3c4404E53D.1050605@apache.org%3e">"Create function problem"</a>
       derby-user mail list topic.
       </p>
-</div>
-<a name="N10162"></a><a name="limit"></a>
-<h4 class="faq">5.2. 
+<a name="limit"></a>
+<h3 class="boxed">5.2. 
       Does Derby support a LIMIT command? 
-      </h4>
-<div align="right">
-<a href="#limit-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
           Derby does not support the LIMIT syntax. However, Derby 10.4
           added the <a href="http://db.apache.org/derby/docs/10.13/ref/rreffuncrownumber.html">ROW_NUMBER function</a>
@@ -834,15 +728,10 @@ document.write("Last Published: " + docu
       The <span class="codefrag">LIMIT</span> keyword is not defined in the SQL standard, 
       and is currently not supported.
       </p>
-</div>
-<a name="N101DE"></a><a name="schema_exist"></a>
-<h4 class="faq">5.3. 
+<a name="schema_exist"></a>
+<h3 class="boxed">5.3. 
       Why do I get the error 'schema does not exist'?
-      </h4>
-<div align="right">
-<a href="#schema_exist-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       The current schema for any connection defaults to a schema corresponding
       to the user name. If no user name is supplied then the user name (and
@@ -866,15 +755,10 @@ document.write("Last Published: " + docu
       when there is a problem with the sql for the very first object you try
       to create in a particular schema and no explicit CREATE SCHEMA was issued.
       </p>
-</div>
-<a name="N101EF"></a><a name="debug_lock_timeout"></a>
-<h4 class="faq">5.4. 
+<a name="debug_lock_timeout"></a>
+<h3 class="boxed">5.4. 
       I get a lock timeout error. How do I debug this?
-      </h4>
-<div align="right">
-<a href="#debug_lock_timeout-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       To debug lock timeout errors, set 
       <span class="codefrag">derby.locks.monitor=true</span>
@@ -899,15 +783,10 @@ document.write("Last Published: " + docu
       <a class="external" href="http://wiki.apache.org/db-derby/LockDebugging">LockDebugging</a>
       wiki page.
       </p>
-</div>
-<a name="N10210"></a><a name="identity"></a>
-<h4 class="faq">5.5. 
+<a name="identity"></a>
+<h3 class="boxed">5.5. 
       Can Derby generate unique identifiers like sequences?
-      </h4>
-<div align="right">
-<a href="#identity-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
         SEQUENCE support was added to Derby in release 10.6.
       </p>
@@ -920,16 +799,13 @@ document.write("Last Published: " + docu
         function returns the most recently assigned number.
       </p>
 </div>
-<a name="N10223"></a><a name="users_client"></a>
-<h3 class="boxed">6. Using Derby: Client Programming</h3>
-<a name="N10227"></a><a name="clientserv"></a>
-<h4 class="faq">6.1. 
+<a name="users_client"></a>
+<h2 class="boxed">6. Using Derby: Client Programming</h2>
+<div class="section">
+<a name="clientserv"></a>
+<h3 class="boxed">6.1. 
       Can you use Derby for client-server applications?
-      </h4>
-<div align="right">
-<a href="#clientserv-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Yes, you can use derby for client-server applications.
       Starting in 10.1 Derby included the
@@ -941,15 +817,10 @@ document.write("Last Published: " + docu
       <a class="external" href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM
       DB2 JDBC Universal Driver</a>.
       </p>
-</div>
-<a name="N1023F"></a><a name="netclient"></a>
-<h4 class="faq">6.2. 
+<a name="netclient"></a>
+<h3 class="boxed">6.2. 
       Does Derby include a client-server ("network") jdbc driver?
-      </h4>
-<div align="right">
-<a href="#netclient-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Yes, Apache Derby has a JDBC driver
       that works with the Derby Network Server.
@@ -957,16 +828,11 @@ document.write("Last Published: " + docu
       <a href="http://db.apache.org/derby/docs/10.13/adminguide/cadminappsclient.html">Derby Network Client</a>
       and it became available starting with Derby 10.1.
       </p>
-</div>
-<a name="N1024B"></a><a name="db2_jcc_errors"></a>
-<h4 class="faq">6.3. 
+<a name="db2_jcc_errors"></a>
+<h3 class="boxed">6.3. 
       How can I get the message text for an error using the DB2 JDBC
       Universal Driver?
-      </h4>
-<div align="right">
-<a href="#db2_jcc_errors-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Set the connection attribute 
       <span class="codefrag">retrieveMessagesFromServerOnGetMessage=true</span>.
@@ -975,31 +841,21 @@ document.write("Last Published: " + docu
       Network server and the IBM DB2 Universal JDBC Driver"</a>
       mail list topic.
       </p>
-</div>
-<a name="N1025A"></a><a name="derby_xa"></a>
-<h4 class="faq">6.4. 
+<a name="derby_xa"></a>
+<h3 class="boxed">6.4. 
       Can you execute a query that spans two Derby databases 
       across different JVMs?
-      </h4>
-<div align="right">
-<a href="#derby_xa-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       XA support using Network Server allows you to do this and the
       Derby Network Client, new in 10.1, supports this functionality.
       An example of establishing an XA connection is in the 
       <a href="http://db.apache.org/derby/docs/10.13/adminguide/cadminapps811478.html">Admin and Server Guide</a>.
       </p>
-</div>
-<a name="N10266"></a><a name="derby_faster"></a>
-<h4 class="faq">6.5. 
+<a name="derby_faster"></a>
+<h3 class="boxed">6.5. 
       Are there any tips to make Derby go faster?
-      </h4>
-<div align="right">
-<a href="#derby_faster-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       Here are two performance tips for coding applications:
       </p>
@@ -1026,15 +882,10 @@ document.write("Last Published: " + docu
       </li>
       
 </ol>
-</div>
-<a name="N1027F"></a><a name="jdbc_lob"></a>
-<h4 class="faq">6.6. 
+<a name="jdbc_lob"></a>
+<h3 class="boxed">6.6. 
       Where is an example that shows how to insert a CLOB?
-      </h4>
-<div align="right">
-<a href="#jdbc_lob-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       The <em>Reference Guide</em> includes an 
       <a href="http://db.apache.org/derby/docs/10.13/ref/rrefclob.html">example
@@ -1044,21 +895,15 @@ document.write("Last Published: " + docu
       derby-user post</a>
       provides another example.
       </p>
-</div>
-<a name="N10292"></a><a name="jdbc4"></a>
-<h4 class="faq">6.7. 
+<a name="jdbc4"></a>
+<h3 class="boxed">6.7. 
       Does Derby support JDBC 4.0?
-      </h4>
-<div align="right">
-<a href="#jdbc4-menu">^</a>
-</div>
-<div style="margin-left: 15px">
+      </h3>
 <p>
       From release 10.2.2.0 onward, Derby distributions include compiled versions of JDBC4 drivers.
       </p>
 </div>
 </div>
-</div>
 <!--+
     |end content
     +-->

Modified: websites/production/db/content/derby/index.html
==============================================================================
--- websites/production/db/content/derby/index.html (original)
+++ websites/production/db/content/derby/index.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Derby</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -175,6 +175,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Apache Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -192,10 +193,11 @@ document.write("Last Published: " + docu
 <a href="#News">News</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="What+is+Apache+Derby%3F"></a>
+<a name="What+is+Apache+Derby%3F"></a>
 <h2 class="boxed">What is Apache Derby?</h2>
 <div class="section">
 <p>
@@ -236,10 +238,10 @@ check out the <a href="quick_start.html"
 </div>
 
 
-<a name="N10043"></a><a name="Events"></a>
+<a name="Events"></a>
 <h2 class="boxed">Events</h2>
 <div class="section">
-<a name="N10048"></a><a name="ApacheCon"></a>
+<a name="ApacheCon"></a>
 <h3 class="boxed">ApacheCon</h3>
 <p>
 
@@ -253,7 +255,7 @@ Many ApacheCon presentations that featur
 </div>
 
 
-<a name="N10063"></a><a name="News"></a>
+<a name="News"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
 <ul>

Modified: websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.html
==============================================================================
--- websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.html (original)
+++ websites/production/db/content/derby/integrate/DerbyTomcat5512JPetStor.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -353,6 +354,7 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 		
 <p>This is the third in a series of articles that detail creating a demonstration web application using a Derby database running in different server environments.   This article details how to create the demo on the Apache Tomcat Server.  See the links in the <a href="#Rlinks">Related Articles</a> section below to access the other articles.</p>
 
@@ -366,7 +368,7 @@ document.write("Last Published: " + docu
 <p>
    This article shows the steps required to embed Derby in a Tomcat version 5.5.12 Server and  then deploy a copy of the iBATIS JPetStore application that utilizes a Derby database.  The implementation accesses the Derby database via a JNDI registered datasource and hence the same application code and Derby database can be used unchanged to create the demo in different environments.  Details are provided for registering the datasource as either a Tomcat server-wide (Global) JNDI resource or a per-application (context specific) JNDI resource.</p>
 		
-<a name="N1001D"></a><a name="Why+Derby"></a>
+<a name="Why+Derby"></a>
 <h2 class="boxed">Why Derby</h2>
 <div class="section">
 <p>
@@ -379,7 +381,7 @@ Installation of the Derby DBMS is as sim
 The web application used for the demonstration is the freely distributable iBATIS JpetStore application.
  -->
 		
-<a name="N1002C"></a><a name="The+Software+Components"></a>
+<a name="The+Software+Components"></a>
 <h2 class="boxed">The Software Components</h2>
 <div class="section">
 <p>Derby is an open source, java relational database freely available from the Apache Software Foundation (ASF).  It is well suited for use with Java applications that require data persistence and is ideally suited for use in a Server environment like Tomcat.  Derby can be used in one of two configurations, embedded in a java application or used with Network Server and run as a separate DBMS process.  When embedded in an application like Tomcat that provides network communication services there is usually no need to run the Network Server.</p>
@@ -389,7 +391,7 @@ Tomcat is a widely used, open source web
 JPetStore is a rewritten Pet Store application based on Sun's J2EE Pet Store. It was originally designed to compare the .NET and J2EE architectures. It is now the official example application for the iBATIS Data Mapper framework.  iBATIS  greatly simplifies the coding of Java and .NET applications that access data from a relational database like Derby.  iBATIS, like the other software used in this implementation is an open source product freely available from ASF.</p>
 </div>
 		
-<a name="N1003C"></a><a name="Typographic+Conventions+Used"></a>
+<a name="Typographic+Conventions+Used"></a>
 <h2 class="boxed">Typographic Conventions Used</h2>
 <div class="section">
 <p> The following codes in curly braces will be used to represent installation dependant information as described below:</p>
@@ -416,7 +418,7 @@ JPetStore is a rewritten Pet Store appli
 </dl>
 </div>
 		
-<a name="N1006D"></a><a name="Required+Software+%2F+Downloads"></a>
+<a name="Required+Software+%2F+Downloads"></a>
 <h2 class="boxed">Required Software / Downloads</h2>
 <div class="section">
 <ul>
@@ -430,7 +432,7 @@ JPetStore is a rewritten Pet Store appli
 </ul>
 </div>
 		
-<a name="N10088"></a><a name="Setup+of+Application+with+the+Datasource+in+the+Global+Context%3A"></a>
+<a name="Setup+of+Application+with+the+Datasource+in+the+Global+Context%3A"></a>
 <h2 class="boxed">Setup of Application with the Datasource in the Global Context:</h2>
 <div class="section">
 <p>The initial steps below walk you through moving the files contained in the DerbyJPetStore4Tomcat.zip file to the  locations required to support the deployment instructions that follow.  Note that the zipfile contains not only the application system but also the DBMS and the initialized database.  No database activity is required other than placing the files in the proper directories.  Assuming you have a functioning Tomcat 5.5.12 system already everything you need to create the demo is found in the zipfile associated with this article.</p>
@@ -507,7 +509,7 @@ Deploy directory or WAR file located on
 </div>
 
 		
-<a name="N100F9"></a><a name="Alternate+Setup%3A+Datasource+in+the+Application+Context"></a>
+<a name="Alternate+Setup%3A+Datasource+in+the+Application+Context"></a>
 <h2 class="boxed">Alternate Setup: Datasource in the Application Context</h2>
 <div class="section">
 <p>The datasource connection pool used by the JPetStore application can be defined in the Global context as show above or in the Application context outlined here.  Either context will support connections between  iBATIS and Derby.  The difference between the two setups is whether or not another application deployed to this Tomcat server will be able to access the datasource.  When the datasource is defined in the Global context other applications can also connect to the pool by linking to the Global datasource using a copy of the <span class="codefrag">Resource-link</span> definition found in the <span class="codefrag">JPetStoreAppGbl.xml</span> file used in the deployment above.  This is the configuration that should be used if, say, a Petstore accounting or reporting application will be deployed in a separate secured context that is available to a limited number of users.
@@ -571,7 +573,7 @@ Deploy directory or WAR file located on
 </ul>
 </div>
 		
-<a name="N10170"></a><a name="Database+Creation+Instructions+%28optional%29"></a>
+<a name="Database+Creation+Instructions+%28optional%29"></a>
 <h2 class="boxed">Database Creation Instructions (optional)</h2>
 <div class="section">
 <p>The following steps show how to build the Derby database from scratch.  This is similar to the build procedure required when deploying applications using most other DBMS system except a separate database creation step is not required.  Two files (*.sql) are supplied in the zipfile to perform the schema build and data inserts.  To use this procedure you will need to download a complete set of Derby jarfiles in order to obtain the IJ scripting tool used in the following commands.  The IJ tool is used to process the SQL commands in the provided scripts.  The IJ tool is contained in the derbytools.jar file.  Place derbytools.jar in the {Derby_Jars} directory.   For simplicity the examples below place all necessary files in the same directory and specify as much a possible (including the command to create the database) on the command line.</p>
@@ -608,7 +610,7 @@ Deploy directory or WAR file located on
 </div>
 		<!--			Integration Notes Section			-->
 		
-<a name="N10199"></a><a name="General+Integration+Notes"></a>
+<a name="General+Integration+Notes"></a>
 <h2 class="boxed">General Integration Notes</h2>
 <div class="section">
 <p>
@@ -619,7 +621,7 @@ J2EE Servers use multiple classloaders (
 </div>
 		
 		
-<a name="N101A6"></a><a name="Tomcat+Integration+Notes"></a>
+<a name="Tomcat+Integration+Notes"></a>
 <h2 class="boxed">Tomcat Integration Notes</h2>
 <div class="section">
 <p>Tomcat is designed so that new java components (a.k.a. shared libraries) can be easily added to the system.  This is accomplished by adding the jarfiles containing the components to the $CATALINA_HOME/common/lib directory.  
@@ -648,7 +650,7 @@ java.lang.ExceptionInInitializerError
 </div>
 </div>
 		
-<a name="N101D0"></a><a name="iBATIS+Integration+Notes"></a>
+<a name="iBATIS+Integration+Notes"></a>
 <h2 class="boxed">iBATIS Integration Notes</h2>
 <div class="section">
 <p>If you wish to build your own iBATIS JPetstore war file like the one supplied in the zipfile file  you will need to download the JPetStore application source code (see the 'Related Links' section) and make the following modifications to the source files before performing a build as described in the JPetStore build instructions: </p>
@@ -683,7 +685,7 @@ java.lang.ExceptionInInitializerError
 </div>
 		<!--		RELATED LINKS SECTION  -->
 		
-<a name="N101F3"></a><a name="Rlinks"></a>
+<a name="Rlinks"></a>
 <h2 class="boxed">Links Section</h2>
 <div class="section">
 <p>Required Downloads to perform this deployment: </p>

Modified: websites/production/db/content/derby/integrate/JPOX_Derby.html
==============================================================================
--- websites/production/db/content/derby/integrate/JPOX_Derby.html (original)
+++ websites/production/db/content/derby/integrate/JPOX_Derby.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Using JPOX JDO with Derby</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Using JPOX JDO with Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -355,10 +356,11 @@ document.write("Last Published: " + docu
 <a href="#Resources+and+Acknowledgements">Resources and Acknowledgements</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -390,7 +392,7 @@ to use the two together.
 </div>
 
 
-<a name="N10023"></a><a name="Step+1.+Prerequisites"></a>
+<a name="Step+1.+Prerequisites"></a>
 <h2 class="boxed">Step 1. Prerequisites</h2>
 <div class="section">
 <p>
@@ -475,7 +477,7 @@ source files provided in the download zi
 </div>
 
 
-<a name="N100F9"></a><a name="Step+2.+Download+sample+code+and+configuration+files"></a>
+<a name="Step+2.+Download+sample+code+and+configuration+files"></a>
 <h2 class="boxed">Step 2. Download sample code and configuration files</h2>
 <div class="section">
 <p>
@@ -490,7 +492,7 @@ to the C:/ directory on a windows machin
 </div>
 
 
-<a name="N1010D"></a><a name="Step+3.+Examine%2FCreate+the+Database+schema"></a>
+<a name="Step+3.+Examine%2FCreate+the+Database+schema"></a>
 <h2 class="boxed">Step 3. Examine/Create the Database schema</h2>
 <div class="section">
 <p>
@@ -578,7 +580,7 @@ Foreign Key (username) REFERENCES APP.US
 </div>
 
 
-<a name="N1011F"></a><a name="Step+4.+Write+the+classes+used+to+persist+the+data"></a>
+<a name="Step+4.+Write+the+classes+used+to+persist+the+data"></a>
 <h2 class="boxed">Step 4. Write the classes used to persist the data</h2>
 <div class="section">
 <p>
@@ -654,7 +656,7 @@ public class CityBean {
 </div>
 
 
-<a name="N10137"></a><a name="Step+5.++Create+the+JDO+meta-data+mapping+file"></a>
+<a name="Step+5.++Create+the+JDO+meta-data+mapping+file"></a>
 <h2 class="boxed">Step 5.  Create the JDO meta-data mapping file</h2>
 <div class="section">
 <p>
@@ -771,7 +773,7 @@ of the packages I'm using.
 </div>
 
 
-<a name="N10181"></a><a name="Step+6.+Create+a+log4j.properties+file+to+be+used+by+JPOX"></a>
+<a name="Step+6.+Create+a+log4j.properties+file+to+be+used+by+JPOX"></a>
 <h2 class="boxed">Step 6. Create a log4j.properties file to be used by JPOX</h2>
 <div class="section">
 <p>
@@ -802,7 +804,7 @@ log4j.category.JPOX.SchemaTool=INFO, A1
 </p>
 </div>
 
-<a name="N10195"></a><a name="Step+7.+Enhancing+the+JPOX+classes"></a>
+<a name="Step+7.+Enhancing+the+JPOX+classes"></a>
 <h2 class="boxed">Step 7. Enhancing the JPOX classes</h2>
 <div class="section">
 <p>
@@ -819,7 +821,7 @@ class and application class.
 </div>
 
 
-<a name="N101A7"></a><a name="Step+8.+Code+the+class+which+makes+the+JPOX+JDO+queries"></a>
+<a name="Step+8.+Code+the+class+which+makes+the+JPOX+JDO+queries"></a>
 <h2 class="boxed">Step 8. Code the class which makes the JPOX JDO queries</h2>
 <div class="section">
 <p>
@@ -1038,7 +1040,7 @@ is read at run time to initialize the <s
 </div>
 
 
-<a name="N101E1"></a><a name="Step+9.+Code+the+application+class+which+calls+the+business+logic+class"></a>
+<a name="Step+9.+Code+the+application+class+which+calls+the+business+logic+class"></a>
 <h2 class="boxed">Step 9. Code the application class which calls the business logic class</h2>
 <div class="section">
 <p>
@@ -1085,7 +1087,7 @@ public class DerbyJPox {
 </div>
 
 
-<a name="N101F8"></a><a name="Step+10.+Compile+all+classes%2C+enhance+the+persistence+capable+ones+and+run+the+application"></a>
+<a name="Step+10.+Compile+all+classes%2C+enhance+the+persistence+capable+ones+and+run+the+application"></a>
 <h2 class="boxed">Step 10. Compile all classes, enhance the persistence capable ones and run the application</h2>
 <div class="section">
 <p>
@@ -1281,7 +1283,7 @@ Shutting down JPOX persistence manager.
 </div>
 
 
-<a name="N102CA"></a><a name="Resources+and+Acknowledgements"></a>
+<a name="Resources+and+Acknowledgements"></a>
 <h2 class="boxed">Resources and Acknowledgements</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/integrate/JPetStoreGeronimo.html
==============================================================================
--- websites/production/db/content/derby/integrate/JPetStoreGeronimo.html (original)
+++ websites/production/db/content/derby/integrate/JPetStoreGeronimo.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Using  Apache Derby with iBATIS JPetStore 4 running on the Geronimo J2EE server</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Using  Apache Derby with iBATIS JPetStore 4 running on the Geronimo J2EE server</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -341,12 +342,13 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
+</div>
 		
 <p>
 The first tasks performed when installing an application that uses a database are generally related to database setup.  These steps often involve compiling DBMS code (if the database system is not already installed) and creating and populating the physical database used by the application.  Such steps are required to create executables and files that can be used in the operating environment of the host computer.  By using a database like Derby that is implemented entirely in JAVA these build steps are not required.  Installation of the Derby DBMS can be as simple as copying a 2 Mb jarfile to a known location.  The fully initialized physical database can be bundled with the application thus reducing the database setup steps to a simple copy operation.  The following instructions demonstrate this by deploying the iBATIS JPetStore application along with a ready-to-go Derby database on a Geronimo server.   These instructions can be used on any machine with a functioning J2SE JVM using t
 he ASCII codeset.  Conversion or recreation of the supporting files (but not the database) will be required for deployment in an EBCDIC environment.
 </p>
 		
-<a name="N10010"></a><a name="Introduction"></a>
+<a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>
@@ -354,7 +356,7 @@ This article demonstrates the ease with
 </p>
 </div>
 				
-<a name="N10026"></a><a name="Typographic+Conventions+Used"></a>
+<a name="Typographic+Conventions+Used"></a>
 <h2 class="boxed">Typographic Conventions Used</h2>
 <div class="section">
 <p> The following codes in curly braces will be used to represent installation dependant file locations as described below:</p>
@@ -371,7 +373,7 @@ This article demonstrates the ease with
 </ul>
 </div>
 		
-<a name="N1004E"></a><a name="Required+Software+%2F+Downloads"></a>
+<a name="Required+Software+%2F+Downloads"></a>
 <h2 class="boxed">Required Software / Downloads</h2>
 <div class="section">
 <ul>
@@ -385,7 +387,7 @@ This article demonstrates the ease with
 </ul>
 </div>
 		
-<a name="N10069"></a><a name="Setup+Steps%3A"></a>
+<a name="Setup+Steps%3A"></a>
 <h2 class="boxed">Setup Steps:</h2>
 <div class="section">
 <ul>	
@@ -453,7 +455,7 @@ This article demonstrates the ease with
 </div>
 		
 		
-<a name="N100BE"></a><a name="Optional+Database+Setup+Instructions"></a>
+<a name="Optional+Database+Setup+Instructions"></a>
 <h2 class="boxed">Optional Database Setup Instructions</h2>
 <div class="section">
 <p>The following steps show how to build the Derby database from scratch.  Two files (*.sql) are supplied in the JPetStoreAPP4Geronimo.zip. file to perform the initial build and data inserts.  You will need to download the complete set of Derby jarfiles and use the IJ tool found in derbytools.jar to perform the build.  Place derbytools.jar in the {Derby_Jars} directory.   The IJ tool is used to process the SQL commands in the provided scripts.  For simplicity the examples below place all necessary files in the same directory and specify as much a possible (including the command to create the database) on the command line.</p>
@@ -480,7 +482,7 @@ This article demonstrates the ease with
 </div>
 					<!--			Integration Notes Section			-->
 		
-<a name="N100E4"></a><a name="Integration+Notes"></a>
+<a name="Integration+Notes"></a>
 <h2 class="boxed">Integration Notes</h2>
 <div class="section">
 <p>
@@ -522,7 +524,7 @@ J2EE Servers use multiple classloaders (
 		
 		<!--		RELATED LINKS SECTION  -->
 		
-<a name="N10110"></a><a name="Related+Links"></a>
+<a name="Related+Links"></a>
 <h2 class="boxed">Related Links</h2>
 <div class="section">
 <p>Required Downloads to perform this deployment: </p>

Modified: websites/production/db/content/derby/integrate/SQuirreL_Derby.html
==============================================================================
--- websites/production/db/content/derby/integrate/SQuirreL_Derby.html (original)
+++ websites/production/db/content/derby/integrate/SQuirreL_Derby.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Using SQuirreL SQL Client with Derby</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Using SQuirreL SQL Client with Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -346,10 +347,11 @@ document.write("Last Published: " + docu
 <a href="#SQuirreL+and+Derby+Resources">SQuirreL and Derby Resources</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -394,7 +396,7 @@ Dropping tables
 </div>
 
 
-<a name="N10032"></a><a name="Prerequisites"></a>
+<a name="Prerequisites"></a>
 <h2 class="boxed">Prerequisites</h2>
 <div class="section">
 <p>
@@ -463,7 +465,7 @@ launch (or double-click on Windows) the
 </div>
 
 
-<a name="N100B6"></a><a name="Configuring+SQuirreL+for+the+Derby+Embedded+JDBC+Driver"></a>
+<a name="Configuring+SQuirreL+for+the+Derby+Embedded+JDBC+Driver"></a>
 <h2 class="boxed">Configuring SQuirreL for the Derby Embedded JDBC Driver </h2>
 <div class="section">
 <p>
@@ -522,7 +524,7 @@ listing in the Drivers window now.
 </div>
 
 
-<a name="N10115"></a><a name="Creating+an+Alias+to+a+Derby+database+using+the+Embedded+Driver"></a>
+<a name="Creating+an+Alias+to+a+Derby+database+using+the+Embedded+Driver"></a>
 <h2 class="boxed">Creating an Alias to a Derby database using the Embedded Driver</h2>
 <div class="section">
 <p>
@@ -557,7 +559,7 @@ the Derby Client driver first, before br
 </div>
 
 
-<a name="N10151"></a><a name="Configuring+the+Derby+Client+Driver+in+the+Drivers+window"></a>
+<a name="Configuring+the+Derby+Client+Driver+in+the+Drivers+window"></a>
 <h2 class="boxed">Configuring the Derby Client Driver in the Drivers window</h2>
 <div class="section">
 <p>
@@ -627,7 +629,7 @@ to connect to our database, <span class=
 </div>
 
 
-<a name="N101C7"></a><a name="Creating+an+Alias+for+an+existing+Derby+database+using+the+Client+Driver"></a>
+<a name="Creating+an+Alias+for+an+existing+Derby+database+using+the+Client+Driver"></a>
 <h2 class="boxed">Creating an Alias for an existing Derby database using the Client Driver</h2>
 <div class="section">
 <p>
@@ -666,7 +668,7 @@ JVMs to connect to the same database.
 </div>
 
 
-<a name="N1020E"></a><a name="Creating+a+session+to+issue+SQL+and+browse+the+database"></a>
+<a name="Creating+a+session+to+issue+SQL+and+browse+the+database"></a>
 <h2 class="boxed">Creating a session to issue SQL and browse the database</h2>
 <div class="section">
 <p>
@@ -894,7 +896,7 @@ left icon on the menu bar and set the pr
 </div>
 
 
-<a name="N102E5"></a><a name="Modifying+data+objects+via+the+Objects+tab"></a>
+<a name="Modifying+data+objects+via+the+Objects+tab"></a>
 <h2 class="boxed">Modifying data objects via the Objects tab</h2>
 <div class="section">
 <p>
@@ -998,7 +1000,7 @@ tab to see all of the data you just load
 </div>
 
 
-<a name="N10393"></a><a name="SQuirreL+and+Derby+Resources"></a>
+<a name="SQuirreL+and+Derby+Resources"></a>
 <h2 class="boxed">SQuirreL and Derby Resources</h2>
 <div class="section">
 <p>

Modified: websites/production/db/content/derby/integrate/db_ddlutils.html
==============================================================================
--- websites/production/db/content/derby/integrate/db_ddlutils.html (original)
+++ websites/production/db/content/derby/integrate/db_ddlutils.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Using DdlUtils to Migrate Databases to Derby</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Using DdlUtils to Migrate Databases to Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -359,7 +360,7 @@ document.write("Last Published: " + docu
 <a href="#Add+an+import+target+to+the+build.xml">Add an import target to the build.xml</a>
 </li>
 <li>
-<a href="#Execute+the+Ant+task-N10228">Execute the Ant task</a>
+<a href="#Execute+the+Ant+task-N10229">Execute the Ant task</a>
 </li>
 </ul>
 </li>
@@ -373,10 +374,11 @@ document.write("Last Published: " + docu
 <a href="#Questions%3F">Questions?</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -412,7 +414,7 @@ you must export the schema and data beca
 an alpha database.
 DdlUtils makes this migration easier.
 </p>
-<a name="N1002F"></a><a name="Target+Audience"></a>
+<a name="Target+Audience"></a>
 <h3 class="boxed">Target Audience</h3>
 <p>DdlUtils doesn't have an official release yet, 
       so this example is intended for developers -- and for users who have a 
@@ -426,7 +428,7 @@ DdlUtils makes this migration easier.
       variables, and troubleshooting
       any problems that might occur.
    </p>
-<a name="N10039"></a><a name="Prerequisites"></a>
+<a name="Prerequisites"></a>
 <h3 class="boxed">Prerequisites</h3>
 <p>This project assumes a basic knowledge of Derby.
          If you're new, start with the on-line
@@ -455,7 +457,7 @@ DdlUtils makes this migration easier.
 </div>
 
 
-<a name="N1006F"></a><a name="Step+1%3A+Setup+a+working+directory"></a>
+<a name="Step+1%3A+Setup+a+working+directory"></a>
 <h2 class="boxed">Step 1: Setup a working directory</h2>
 <div class="section">
 <p>
@@ -473,7 +475,7 @@ mkdir lib</p>
 </div>
 
 
-<a name="N10086"></a><a name="Step+2%3A+Build+and+Install+DdlUtils"></a>
+<a name="Step+2%3A+Build+and+Install+DdlUtils"></a>
 <h2 class="boxed">Step 2: Build and Install DdlUtils</h2>
 <div class="section">
 <p>
@@ -527,7 +529,7 @@ cd ..  </p>
 
 
 
-<a name="N100C8"></a><a name="Step+3%3A+Create+a+sample+database%3A+Books1"></a>
+<a name="Step+3%3A+Create+a+sample+database%3A+Books1"></a>
 <h2 class="boxed">Step 3: Create a sample database: Books1 </h2>
 <div class="section">
 <p>
@@ -593,7 +595,7 @@ Finally, exit the database:
 </div>
 
 
-<a name="N10102"></a><a name="Step+4%3A+Books1+--+Export+Schema+and+Data"></a>
+<a name="Step+4%3A+Books1+--+Export+Schema+and+Data"></a>
 <h2 class="boxed">Step 4: Books1 -- Export Schema and Data </h2>
 <div class="section">
 <p>
@@ -603,7 +605,7 @@ You'll use the
 <a href="http://db.apache.org/ddlutils/ant/index.all.html">DdlUtils Ant tasks</a>
 to execute the export.
 </p>
-<a name="N10115"></a><a name="Create+an+Ant+build.xml+file+with+an+export+target"></a>
+<a name="Create+an+Ant+build.xml+file+with+an+export+target"></a>
 <h3 class="boxed">Create an Ant build.xml file with an export target</h3>
 <p>
 Complete source for the Ant build file is below.
@@ -683,7 +685,7 @@ Here are a few notes about the <span cla
 </li>
 
 </ul>
-<a name="N10173"></a><a name="Execute+the+Ant+task"></a>
+<a name="Execute+the+Ant+task"></a>
 <h3 class="boxed">Execute the Ant task</h3>
 <p>
 Now execute the task with <span class="codefrag">ant</span>:
@@ -705,7 +707,7 @@ succeeded and there should be two new fi
 </div>
 
 
-<a name="N10198"></a><a name="Step+5%3A+Books2+--+Create+Database+and+Import+Schema+and+Data"></a>
+<a name="Step+5%3A+Books2+--+Create+Database+and+Import+Schema+and+Data"></a>
 <h2 class="boxed">Step 5: Books2 -- Create Database and Import Schema and Data</h2>
 <div class="section">
 <p>
@@ -715,7 +717,7 @@ As with the export task, you'll use the
 <a href="http://db.apache.org/ddlutils/ant/index.all.html">DdlUtils Ant tasks</a>
 to execute the import.
 </p>
-<a name="N101AB"></a><a name="Copy+and+%28maybe%29+modify+the+db-schema.xml+file"></a>
+<a name="Copy+and+%28maybe%29+modify+the+db-schema.xml+file"></a>
 <h3 class="boxed">Copy and (maybe) modify the db-schema.xml file </h3>
 <p>
 The export step created a file called <span class="codefrag">db-schema.xml</span>. Copy that
@@ -751,7 +753,7 @@ for example, to change the mapping of a
 </li>
 
 </ul>
-<a name="N101E9"></a><a name="Add+an+import+target+to+the+build.xml"></a>
+<a name="Add+an+import+target+to+the+build.xml"></a>
 <h3 class="boxed">Add an import target to the build.xml</h3>
 <p>
 Copy the source for the <span class="codefrag">import-target-db</span> target below
@@ -802,7 +804,7 @@ Here are a few notes about the source:
    </li>
 
 </ul>
-<a name="N10228"></a><a name="Execute+the+Ant+task-N10228"></a>
+<a name="Execute+the+Ant+task-N10229"></a>
 <h3 class="boxed">Execute the Ant task</h3>
 <p>
 Execute the task with <span class="codefrag">ant</span>:
@@ -831,7 +833,7 @@ Total time: 4 seconds </p>
 </div>
 
 
-<a name="N10241"></a><a name="Step+6%3A+Verify+Migration"></a>
+<a name="Step+6%3A+Verify+Migration"></a>
 <h2 class="boxed">Step 6: Verify Migration</h2>
 <div class="section">
 <p>
@@ -852,7 +854,7 @@ ij&gt; select * from book;
 </div>
 
 
-<a name="N1025D"></a><a name="Caveats"></a>
+<a name="Caveats"></a>
 <h2 class="boxed">Caveats</h2>
 <div class="section">
 <p>
@@ -865,7 +867,7 @@ DdlUtils database support on the
 </div>
 
 
-<a name="N1026B"></a><a name="Questions%3F"></a>
+<a name="Questions%3F"></a>
 <h2 class="boxed">Questions?</h2>
 <div class="section">
 <p>Please post questions about this example to 

Modified: websites/production/db/content/derby/integrate/db_torque.html
==============================================================================
--- websites/production/db/content/derby/integrate/db_torque.html (original)
+++ websites/production/db/content/derby/integrate/db_torque.html Sun Oct  1 16:35:06 2017
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Running the Torque Tutorial on Derby</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -316,6 +316,7 @@ document.write("Last Published: " + docu
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Running the Torque Tutorial on Derby</h1>
+<div id="front-matter">
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -367,10 +368,11 @@ document.write("Last Published: " + docu
 <a href="#Got+Questions%3F">Got Questions?</a>
 </li>
 </ul>
+</div>
 </div> 
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -402,7 +404,7 @@ Details are in
 </div>
 
 
-<a name="N10029"></a><a name="Step+1"></a>
+<a name="Step+1"></a>
 <h2 class="boxed">Step 1</h2>
 <div class="section"></div>
 
@@ -412,10 +414,10 @@ No changes to this step are required.
 </p>
 
 
-<a name="N10033"></a><a name="Step+2"></a>
+<a name="Step+2"></a>
 <h2 class="boxed">Step 2</h2>
 <div class="section">
-<a name="N10039"></a><a name="Torque+Generator+Properties"></a>
+<a name="Torque+Generator+Properties"></a>
 <h3 class="boxed">Torque Generator Properties</h3>
 <p>Below is a <span class="codefrag">project.properties</span> file that works
       with the Derby embedded driver:</p>
@@ -457,10 +459,10 @@ No changes to this step are required.
 
 
 
-<a name="N1004B"></a><a name="Step+3"></a>
+<a name="Step+3"></a>
 <h2 class="boxed">Step 3</h2>
 <div class="section">
-<a name="N10051"></a><a name="Adding+the+driver+to+the+maven+repository"></a>
+<a name="Adding+the+driver+to+the+maven+repository"></a>
 <h3 class="boxed">Adding the driver to the maven repository</h3>
 <p>
 I added the Derby jar to my local maven repository like this:
@@ -474,7 +476,7 @@ I added the Derby jar to my local maven
 There are probably other ways for incorporating the Derby jar
 that don't require renaming the jar to include the version.
 </p>
-<a name="N10062"></a><a name="Specifying+the+driver+dependency"></a>
+<a name="Specifying+the+driver+dependency"></a>
 <h3 class="boxed">Specifying the driver dependency</h3>
 <p>
 Here is the complete <span class="codefrag">project.xml</span> file:
@@ -498,7 +500,7 @@ Here is the complete <span class="codefr
      &lt;/dependencies&gt;
    &lt;/project&gt;
 </pre>
-<a name="N10073"></a><a name="Creating+the+database"></a>
+<a name="Creating+the+database"></a>
 <h3 class="boxed">Creating the database</h3>
 <p>
 The Torque Tutorial instructions mention that 
@@ -534,7 +536,7 @@ If I were on Windows, I would have set t
 <pre class="code">
    set DERBY_SYSTEM_HOME=C:\home\jta\Apache\TorqueTutorial
 </pre>
-<a name="N1009B"></a><a name="Creating+the+tables"></a>
+<a name="Creating+the+tables"></a>
 <h3 class="boxed">Creating the tables</h3>
 <p>
 No changes to this step are required.
@@ -542,10 +544,10 @@ No changes to this step are required.
 </div>
 
 
-<a name="N100A6"></a><a name="Step+4"></a>
+<a name="Step+4"></a>
 <h2 class="boxed">Step 4</h2>
 <div class="section">
-<a name="N100AC"></a><a name="Torque+Run-Time+Properties"></a>
+<a name="Torque+Run-Time+Properties"></a>
 <h3 class="boxed">Torque Run-Time Properties</h3>
 <p>
 Here is the complete <span class="codefrag">src/conf/torque.properties</span> file:
@@ -564,7 +566,7 @@ Here is the complete <span class="codefr
 </div>
 
 
-<a name="N100BE"></a><a name="Step+5"></a>
+<a name="Step+5"></a>
 <h2 class="boxed">Step 5</h2>
 <div class="section">
 <p>
@@ -573,7 +575,7 @@ No changes to this step are required.
 </div>
 
 
-<a name="N100C8"></a><a name="Step+6"></a>
+<a name="Step+6"></a>
 <h2 class="boxed">Step 6</h2>
 <div class="section">
 <p>
@@ -600,7 +602,7 @@ Here is the command I ran on my Linux ma
 </div>
 
 
-<a name="N100E8"></a><a name="Got+Questions%3F"></a>
+<a name="Got+Questions%3F"></a>
 <h2 class="boxed">Got Questions?</h2>
 <div class="section">
 <p>