svn commit: r799113 - /websites/staging/rave/trunk/content/rave/documentation/configure-database.html

[bu...@apache.org]

Author: buildbot
Date: Tue Nov 22 16:41:40 2011
New Revision: 799113

Log:
Staging update by buildbot

Modified:
    websites/staging/rave/trunk/content/rave/documentation/configure-database.html

Modified: websites/staging/rave/trunk/content/rave/documentation/configure-database.html
==============================================================================
--- websites/staging/rave/trunk/content/rave/documentation/configure-database.html (original)
+++ websites/staging/rave/trunk/content/rave/documentation/configure-database.html Tue Nov 22 16:41:40 2011
@@ -69,7 +69,8 @@
   <div id="content">
     <h1 class="title">Configure the databases</h1>
     <h2 id="default_setup">Default setup</h2>
-<p>In the default setup Rave uses an in memory <a href="http://www.h2database.com/">H2 database</a>.</p>
+<p>In the default setup, Rave uses a file-based <a href="http://www.h2database.com/">H2 database</a>. Rave and Shindig run in the same Tomcat server as
+separate web applications but share data, so we use H2's <a href="http://www.h2database.com/html/features.html#auto_mixed_mode">Automatic Mixed Mode</a>.</p>
 <h3 id="filling_the_default_database">Filling the default database</h3>
 <p>All schemes are generated using JPA annotations. The H2 database is populated with low level SQL queries using the DataSourcePopulator which is configured as Spring bean. These queries are not guaranteed to work for a different database.</p>
 <div class="codehilite"><pre><span class="nt">&lt;bean</span> <span class="na">id=</span><span class="s">&quot;dataSourcePopulator&quot;</span> <span class="na">class=</span><span class="s">&quot;org.apache.rave.jdbc.util.DataSourcePopulator&quot;</span><span class="nt">&gt;</span>
@@ -94,12 +95,10 @@
 </pre></div>
 
 
-<p>The default username is <code>sa</code>, password <code>local</code>.</p>
-<ul>
-<li>Portal database: <a href="http://localhost:11111">http://localhost:11111</a>.<br />
-</li>
-<li>Shindig database: <a href="http://localhost:22222">http://localhost:22222</a>.</li>
-</ul>
+<p>Both Rave and Shindig are accessible from the database: <a href="http://localhost:11111">http://localhost:11111</a>.  The default 
+username is <code>sa</code>, password is <code>local</code>, and JDBC URL is <code>jdbc:h2:file:///tmp/rave_db</code>.  You can change the file location
+for both databases by editing Rave's top level pom.xml file. Change the property <code>rave.database.location</code> to the desired
+value.</p>
 <h2 id="setup_a_different_database">Setup a different database</h2>
 <p>First start with <a href="rave-extensions.html">extending Rave</a>.</p>
 <p>Make sure the JDBC driver ends up in the classpath. Either add it to a common lib directory of the application container or add its dependency to the pom of the several modules.</p>