rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r795748 - in /websites/production/rave: ./ content/rave/documentation/configure-database.html
Date Wed, 14 Sep 2011 13:18:23 GMT
Author: jasha
Date: Wed Sep 14 13:18:22 2011
New Revision: 795748

Log:
Clarifications for properties locations

Modified:
    websites/production/rave/   (props changed)
    websites/production/rave/content/rave/documentation/configure-database.html

Propchange: websites/production/rave/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 13:18:22 2011
@@ -1 +1 @@
-/websites/staging/rave/trunk:787226-795738
+/websites/staging/rave/trunk:787226-795747

Modified: websites/production/rave/content/rave/documentation/configure-database.html
==============================================================================
--- websites/production/rave/content/rave/documentation/configure-database.html (original)
+++ websites/production/rave/content/rave/documentation/configure-database.html Wed Sep 14
13:18:22 2011
@@ -85,7 +85,7 @@
 
 <p>If the query in <code>executeScriptQuery</code> returns no error and
no results, the database will be populated with the contents of <code>scriptLocations</code>.</p>
 <h3 id="access_the_default_database">Access the default database</h3>
-<p>.When the application is running the H2 databases can be accessed through a web
interface. In the default setup this is configured using a Spring bean:</p>
+<p>When the application is running, the H2 databases can be accessed through a web
interface. In the default setup this is configured using a Spring bean:</p>
 <div class="codehilite"><pre><span class="nt">&lt;bean</span>
<span class="na">id=</span><span class="s">&quot;org.h2.tools.Server-WebServer&quot;</span>
<span class="na">class=</span><span class="s">&quot;org.h2.tools.Server&quot;</span>
       <span class="na">factory-method=</span><span class="s">&quot;createWebServer&quot;</span>
<span class="na">depends-on=</span><span class="s">&quot;dataSource&quot;</span>
       <span class="na">init-method=</span><span class="s">&quot;start&quot;</span>
<span class="na">lazy-init=</span><span class="s">&quot;false&quot;</span>
<span class="na">destroy-method=</span><span class="s">&quot;stop&quot;</span><span
class="nt">&gt;</span>
@@ -103,7 +103,8 @@
 <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>
-<p>Then customize the properties for the portal and Shindig to use the database of
your choice.</p>
+<p>Then customize the properties for the portal and Shindig to use the database of
your choice.
+The default portal properties can be found in <code>rave-portal/src/main/resources/portal.properties</code>,
the default Shindig properties in <code>rave-shindig/src/main/resource/rave.shindig.properties</code>.</p>
 <h2 id="sample_values">Sample values</h2>
 <h3 id="mysql">MySQL</h3>
 <h4 id="jdbc_driver">JDBC driver</h4>
@@ -180,7 +181,7 @@
 <h4 id="notes_1">Notes</h4>
 <ul>
 <li>The DataSourcePopulator cannot handle a PostgreSQL database that has not yet been
initialized.</li>
-<li>The syntax for setting variables in SQL queries in PostgreSQL is different from
the syntax in H2 databases. Therefore the default data cannot be loaded using the initial
data.</li>
+<li>The syntax for setting variables in SQL queries in PostgreSQL is different from
the syntax in H2 databases. Therefore the default data cannot be loaded using the initial_data.sql
file.</li>
 </ul>
   </div>
 



Mime
View raw message