Index: guides/guide-properties.xml
===================================================================
--- guides/guide-properties.xml	(revision 369593)
+++ guides/guide-properties.xml	(working copy)
@@ -157,7 +157,7 @@
               <code>org.apache.jetspeed.portal.db.dir</code>
             </td>
             <td>
-              The folder where the maven-plugin will create its build-in HSQLDB database(s).
+              The folder where the maven-plugin will create its HSQLDB database(s).
               <br />
               This folder and its contents is created or updated by plugin goal <code>j2:start.production.server</code>
               or <code>j2:start.test.server</code>.
@@ -168,6 +168,19 @@
           </tr>
           <tr>
             <td>
+              <code>org.apache.jetspeed.derbydatabase.path</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will create its built-in Derby database(s).
+              <br />
+              This folder and its contents is created or updated by plugin goal <code>j2:quickStart</code>.
+            </td>
+            <td>
+              <i>/tmp</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
               <code>org.apache.jetspeed.portal.webapp.dir</code>
             </td>
             <td>
@@ -291,7 +304,7 @@
       </subsection>
       <subsection name="Optional Database Server Properties">
         <p>
-          Jetspeed-2 and its maven-plugin uses, as well as provides, by default a HSQLDB database.
+          Jetspeed-2 and its maven-plugin uses, as well as provides, by default a Derby database.
         </p>
         <p>
           If you want to use a different database you will need to override the following properties:
@@ -311,6 +324,7 @@
               <br />
               Currently supported databases (with corresponding Torque target database name):
               <ul>
+                <li>derby (derby)</li>
                 <li>hsql (hypersonic)</li>
                 <li>oracle (oracle)</li>
                 <li>mysql (mysql)</li>
@@ -318,21 +332,24 @@
                 <li>mssql (mssql)</li>
               </ul>
             </td>
-            <td>hsql</td>
+            <td>derby</td>
           </tr>
           <tr>
             <td>
               <code>org.apache.jetspeed.production.database.url</code>
             </td>
             <td>The jdbc connection url</td>
-            <td>jdbc:hsqldb:hsql://127.0.0.1:9001</td>
+            <td>jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true
+</td>
           </tr>
           <tr>
             <td>
               <code>org.apache.jetspeed.production.database.user</code>
             </td>
             <td>The database user name to connect with.</td>
-            <td>sa</td>
+            <td>
+              <i>empty</i>
+            </td>
           </tr>
           <tr>
             <td>
@@ -348,7 +365,7 @@
               <code>org.apache.jetspeed.production.database.driver</code>
             </td>
             <td>The jdbc driver class name</td>
-            <td>org.hsqldb.jdbcDriver</td>
+            <td>org.apache.derby.jdbc.EmbeddedDriver</td>
           </tr>
           <tr>
             <td>
@@ -367,8 +384,8 @@
       </subsection>
       <subsection name="Example: A minimal custom portal configuration">
         <p>
-          Make sure you have define at least the required properties as described above in your
-          <code>${USER_HOME}/build.properties</code>. A minimal custom portal configuration using the default HSQLDB
+          Make sure you have defined at least the required properties as described above in your
+          <code>${USER_HOME}/build.properties</code>. A minimal custom portal configuration using the default Derby
           database can be something like:
           <source>
             <![CDATA[
@@ -387,11 +404,13 @@
 org.apache.jetspeed.services.autodeployment.password = xxxxx
 org.apache.jetspeed.catalina.version.major           = 5.5]]>
           </source>
+          <!-- This statement is not true!
           <i>
             Note: If you're going to build the default Jetspeed 2 portal directly from the source only the
             <code>org.apache.jetspeed.portal.home</code> property is required from the set of required portal
             configuration properties.
           </i>  
+          -->
         </p>
       </subsection>
     </section>
Index: guides/guide-security-declarative-psml.xml
===================================================================
--- guides/guide-security-declarative-psml.xml	(revision 369593)
+++ guides/guide-security-declarative-psml.xml	(working copy)
@@ -51,7 +51,7 @@
 Grants are associated with permissions, authorizing, or granting, a principal list 
 access to a page or folder.    
 A granting security constraint is the association of a list of one 
-or more security principals combined with one or permissions. Grant constraints grant access to a page or folder
+or more security principals combined with one or more permissions. Grant constraints grant access to a page or folder
 for the associated list of permissions. 
 </p>
 </subsection>
@@ -77,7 +77,7 @@
 </section>
 <section name='The Security Constraint'>
 <p>
-A security constraint is an XML element found in a PSML file, a folder metadata file, or inthe global security declarations.
+A security constraint is an XML element found in a PSML file, a folder metadata file, or in the global security declarations.
 A security constraint has one attribute: the name. A security constraint has the following elements:
 </p>
 <ul>
Index: guides/guide-database.xml
===================================================================
--- guides/guide-database.xml	(revision 369593)
+++ guides/guide-database.xml	(working copy)
@@ -29,8 +29,7 @@
 		<section name="Default Database">
 			<p>
 				The default database distributed with Jetspeed-2 is the
-				Hypersonic SQL Java Database (HSQL). HSQL runs in its
-				own process outside of Jetspeed-2. It is not a
+				Apache Derby. By default Derby runs in embedded mode. It is not a
 				production-ready database, however it allows you to get
 				up and running quickly. To move on to a more robust
 				database, follow the instructions in the next section.
@@ -161,7 +160,7 @@
 				properties in your $HOME/build.properties.
 			</p>
 			<p>
-				NOTE: The Hypersonic JDBC driver is distributed with
+				NOTE: The Derby JDBC driver is distributed with
 				Jetspeed and require no configuration.
 			</p>
 			<source test="">
@@ -191,7 +190,7 @@
 			<subsection name="Distributing Drivers">
 				<p>
 					When Jetspeed is deployed to an application server
-					using the maven deploy target, only the Hypersonic
+					using the maven deploy target, only the Derby 
 					JDBC driver is copied into the web application. To
 					distribute a specific driver (i.e. Oracle, MySQL),
 					you will need to copy the driver into the
Index: guides/guide-app-servers.xml
===================================================================
--- guides/guide-app-servers.xml	(revision 369593)
+++ guides/guide-app-servers.xml	(working copy)
@@ -144,7 +144,7 @@
 		<section name="Optional Database Server Properties">
 			<p>
 				Jetspeed-2 and its maven-plugin uses, as well as
-				provides, by default a HSQLDB database.
+				provides, by default a Derby database.
 			</p>
 			<p>
 				If you want to use a different database you will need to
@@ -169,6 +169,7 @@
 						Currently supported databases (with
 						corresponding Torque target database name):
 						<ul>
+							<li>derby (derby)</li>
 							<li>hsql (hypersonic)</li>
 							<li>oracle (oracle)</li>
 							<li>mysql (mysql)</li>
@@ -176,7 +177,7 @@
 							<li>mssql (mssql)</li>
 						</ul>
 					</td>
-					<td>hsql</td>
+					<td>derby</td>
 				</tr>
 				<tr>
 					<td>
@@ -185,7 +186,8 @@
 						</code>
 					</td>
 					<td>The jdbc connection url</td>
-					<td>jdbc:hsqldb:hsql://127.0.0.1:9001</td>
+					<td>jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true
+</td>
 				</tr>
 				<tr>
 					<td>
@@ -194,7 +196,9 @@
 						</code>
 					</td>
 					<td>The database user name to connect with.</td>
-					<td>sa</td>
+					<td>
+						<i>empty</i>
+                                        </td>
 				</tr>
 				<tr>
 					<td>
@@ -216,7 +220,7 @@
 						</code>
 					</td>
 					<td>The jdbc driver class name</td>
-					<td>org.hsqldb.jdbcDriver</td>
+					<td>org.apache.derby.EmbeddedDriver</td>
 				</tr>
 				<tr>
 					<td>
Index: getting-started-binary.xml
===================================================================
--- getting-started-binary.xml	(revision 369593)
+++ getting-started-binary.xml	(working copy)
@@ -394,7 +394,7 @@
 					configuration properties can be placed in
 					<code>${basedir}build.properties</code>
 					. A minimal custom portal configuration using the
-					default HSQLDB database can be something like:
+					default Derby database can be something like:
 					<source>
 						<![CDATA[
 # required portal configuration properties          
@@ -408,7 +408,7 @@
 					</source>
 				</p>
 				<p>
-					If you are not using the HSQLDB database that comes
+					If you are not using the Derby database that comes
 					pre-configured in the
 					<code>${basedir}project.properties</code>
 					file, you also need to define the database
@@ -488,33 +488,17 @@
 			<subsection name="3.6 Start the Database Server">
 				<p>
 					You need to make sure that your database server is
-					running. If you are not using the default HSQLDB
+					running. If you are not using the default Derby
 					database, you need to make sure that it is running
 					and that the user that will own the Jetspeed tables
 					is setup and ready for use. Refer to the
 					<a href="guide-database.html">Database Configuration</a>
-					section for more information. If you are using the
-					default HSQLDB database you need to start it before
-					deploying the portal.
+					section for more information.
 				</p>
 				<p>
-					To start the HSQLDB production database run the
-					following in a
-					<i>separate</i>
-					console:
-					<source>
-						<![CDATA[
-cd ${org.apache.jetspeed.portal.home}
-maven j2:start.production.server]]>
-					</source>
-				</p>
-				<p>
 					You need to have this database running during the
 					deployment and while running the application server.
-					Afterwards you can stop the database and close this
-					console with a
-					<code>Ctrl-C</code>
-					.
+					Afterwards you can stop the database.
 				</p>
 				<p>
 					Note: this is required when using the
Index: navigation.xml
===================================================================
--- navigation.xml	(revision 369593)
+++ navigation.xml	(working copy)
@@ -23,35 +23,80 @@
             <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
         </links>
         <menu name="Essentials">
-            <item name="Features" href="features.html" />
-        	<item name="Getting Started" href="getting-started.html" />            
+            <item name="Features" href="/features.html" />
+        	<item name="Getting Started" href="/getting-started.html" />            
         </menu>
     	<menu name="Building">
-    	    <item name="From Source" href="getting-started-source.html" />
-    	    <item name="From Maven Plugin" href="getting-started-binary.html" />
+    	    <item name="From Source" href="/getting-started-source.html" />
+    	    <item name="From Maven Plugin" href="/getting-started-binary.html" />
     	</menu>
     	<menu name="Download">
-    		<item name="Installer" href="download.html" />
-    		<item name="Source" href="source-code.html" />
+    		<item name="Installer" href="/download.html" />
+    		<item name="Source" href="/source-code.html" />
     	</menu>
-    	<menu name="Documentation">
-    		<item name="Documentation Guides" href="guides/index.html" />
-    		<item name="Jetspeed-2 API" href="http://portals.apache.org/jetspeed-2/multiproject/jetspeed-api/apidocs/index.html" />
-    		<item name="Jetspeed-2 Plugin" href="j2-maven-plugin.html" />
+        <menu name="Documentation">
+            <item name="Documentation Guides" href="/guides/index.html" collapse="true">
+                <item name="Getting Started" href="/guides/index.html#Getting_Started" collapse="true">
+                    <item name="Getting started guide" href="/getting-started.html" />
+                    <item name="Getting started with Jetspeed-2 source guide" href="/getting-started-source.html" />
+                    <item name="Getting started with Jetspeed-2 binaries guide" href="/getting-started-binary.html" />
+                    <item name="Getting started with Jetspeed-2 installer" href="/getting-started-installer.html" />
+                </item>
+                <item name="Guides to Portal Concepts" href="/guides/index.html#Guides_to_Portal_Concepts" collapse="true">
+                    <item name="Guide to Jetspeed-2 pipeline" href="/guides/guide-pipeline.html" />
+                    <item name="Guide to decorators" href="/guides/guide-decorators.html" />
+                    <item name="Guide to layouts" href="/guides/guide-layouts.html" />
+                </item>
+                <item name="Configuration Guides" href="/guides/index.html#Configuration_Guides" collapse="true">
+                    <item name="Guide to configuration properties" href="/guides/guide-properties.html" />
+                    <item name="Guide to database configuration" href="/guides/guide-database.html" />
+                    <item name="Guide to application servers configuration" href="/guides/guide-app-servers.html" />
+                    <item name="Guide to configuring Jetspeed-2 security" href="/guides/guide-security.html" />
+                    <item name="Guide to using Jetspeed-2 single sign-on" href="/guides/guide-sso.html" />
+                    <item name="Guide to defining user attributes (PLT.17 user information configuration)" href="/guides/guide-user-attributes.html" />
+                    <item name="Guide to using profilers" href="/guides/guide-profiler.html" />
+                </item>
+                <item name="Portal Development Guides" href="/guides/index.html#Portal_Development_Guides" collapse="true">
+                    <item name="Guide to portal design" href="/guides/guide-portal-design.html" />
+                    <item name="Guide to PSML" href="/guides/guide-psml.html" />
+                    <item name="Guide to declarative security through PSML" href="/guides/guide-security-declarative-psml.html" />
+                    <item name="Guide to declarative menus in PSML" href="/guides/guide-menus-declarative-psml.html" />
+                    <item name="Guide to working with a Jetspeed-2 site" href="/guides/guide-site.html" />
+                    <item name="Guide to localization with Jetspeed-2" href="/guides/guide-l10n.html" />
+                    <item name="Guide to Jetspeed-2 AJAX API" href="/guides/guide-ajax-api.html" />
+                    <item name="Guide to a very simple portlet with Jetspeed-2" href="/guides/guide-simple-portlet.html" />
+                    <item name="Guide to portlet bridges" href="/guides/guide-portlet-bridges.html" />
+                </item>
+                <item name="Jetspeed-2 Development Guide" href="/guides/index.html#Jetspeed-2_Development_Guide" collapse="true">
+                    <item name="Guide to Jetspeed-2 development" href="/guides/guide-j2-development.html" />
+                    <item name="Guide to helping with Jetpseed-2" href="/how-to-help.html" />
+                </item>
+                <item name="Guides to Jetspeed-2 Tools"  href="/guides/index.html#Guides_to_Jetspeed-2_Tools" collapse="true">
+                    <item name="Guide to Jetspeed-2 Power Tools" href="/guides/guide-jpt.html" />
+                    <item name="Guide to Jetspeed-2 Portlet Application Deployment" href="/multiproject/jetspeed-deploy-tools/index.html" />
+                    <item name="Guide to Jetspeed-2 Maven Plugin" href="/j2-maven-plugin.html" />
+                </item>
+                <item name="Components Guides" href="/guides/index.html#Components_Guides" collapse="true">
+                    <item name="Guide to Jetspeed-2 component architecture" href="/guides/guide-components.html" />
+                    <item name="Guide to Jetspeed-2 directory structure" href="/guides/guide-dir-structure.html" />
+                </item>
+            </item>
+            <item name="Jetspeed-2 API" href="http://portals.apache.org/jetspeed-2/multiproject/jetspeed-api/apidocs/index.html" />
+            <item name="Jetspeed-2 Plugin" href="/j2-maven-plugin.html" />
     	</menu>
     	<menu name="About Jetspeed-2">
-    		<item name="FAQs" href="faq.html" />
-    		<item name="For Jetspeed-1 Users" href="j1-users.html" />
-    		<item name="Supporting Projects" href="supporting-projects.html" />
-    		<item name="Who Uses J2?" href="who-uses-j2.html" />
-    		<item name="Portlets Community" href="portlets-community.html" />
-    		<item name="How to Help?" href="how-to-help.html" />
+    		<item name="FAQs" href="/faq.html" />
+    		<item name="For Jetspeed-1 Users" href="/j1-users.html" />
+    		<item name="Supporting Projects" href="/supporting-projects.html" />
+    		<item name="Who Uses J2?" href="/who-uses-j2.html" />
+    		<item name="Portlets Community" href="/portlets-community.html" />
+    		<item name="How to Help?" href="/how-to-help.html" />
     	</menu>
         <menu name="Support"> 	
-            <item name="Mailing List" href="mail-lists.html" />
-            <item name="Bug Database" href="issue-tracking.html" />
+            <item name="Mailing List" href="/mail-lists.html" />
+            <item name="Bug Database" href="/issue-tracking.html" />
             <item name="Wiki" href="http://wiki.apache.org/portals/Jetspeed2" />
-            <item name="Quality Testing" href="quality-testing.html" />
+            <item name="Quality Testing" href="/quality-testing.html" />
         </menu>
         <menu name="Translation"> 	
             <item name="Japanese" href="http://jetspeed-japan.sourceforge.jp/jetspeed-2-trans/ja/index.html" />
Index: j2-maven-plugin.xml
===================================================================
--- j2-maven-plugin.xml	(revision 369593)
+++ j2-maven-plugin.xml	(working copy)
@@ -428,18 +428,18 @@
         </tr>
         <tr>
           <td><code>j2:start.production.server</code></td>
-          <td>Starts the default HSQLDB production database for usage by the portal.</td>
+          <td>Starts the HSQLDB production database for usage by the portal. This goal is optional to those who use the default embedded Derby database.</td>
         </tr>
         <tr>
           <td><code>j2:start.test.server</code></td>
           <td>
-            Starts the default HSQLDB test database to be used for the testcases during the build of Jetspeed 2.
+            Starts the default HSQLDB test database to be used for the testcases during the build of Jetspeed 2. This goal is optional for those who use the default embedded Derby database for testing Jetspeed 2.
           </td>
         </tr>
         <tr>
           <td><code>j2:db.create.test</code></td>
           <td>
-            Creates the test database tables. If using the default HSQLDB database, it should be started first with
+            Creates the test database tables. If using the HSQLDB database, it should be started first with
             goal <code>j2:start.test.server</code>.
             <br />
             Existing portal tables are dropped first. The first time, this will lead to "table does not exist"
@@ -449,7 +449,7 @@
         <tr>
           <td><code>j2:db.create.production</code></td>
           <td>
-            Creates the production database tables. If using the default HSQLDB database, it should be started first
+            Creates the production database tables. If using the HSQLDB database, it should be started first
             with goal <code>j2:start.production.server</code>.
             <br />
             Existing portal tables are dropped first. The first time, this will lead to "table does not exist"