svn commit: r1170596 - /incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext

[ja...@apache.org]

Author: jasha
Date: Wed Sep 14 13:12:58 2011
New Revision: 1170596

URL: http://svn.apache.org/viewvc?rev=1170596&view=rev
Log:
Clarify properties location and initial data

Modified:
    incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext

Modified: incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext
URL: http://svn.apache.org/viewvc/incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext?rev=1170596&r1=1170595&r2=1170596&view=diff
==============================================================================
--- incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext (original)
+++ incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext Wed Sep 14 13:12:58 2011
@@ -34,7 +34,7 @@ All schemes are generated using JPA anno
 If the query in `executeScriptQuery` returns no error and no results, the database will be populated with the contents of `scriptLocations`.
 
 ### Access the default database
-.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:
+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:
 
     <bean id="org.h2.tools.Server-WebServer" class="org.h2.tools.Server"
           factory-method="createWebServer" depends-on="dataSource"
@@ -54,6 +54,7 @@ First start with [extending Rave][4].
 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.
 
 Then customize the properties for the portal and Shindig to use the database of your choice.
+The default portal properties can be found in `rave-portal/src/main/resources/portal.properties`, the default Shindig properties in `rave-shindig/src/main/resource/rave.shindig.properties`.
 
 ## Sample values 
 
@@ -127,7 +128,7 @@ Rave Shindig:
 
 #### Notes
   - The DataSourcePopulator cannot handle a PostgreSQL database that has not yet been initialized.
-  - 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.
+  - 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.
 
   [1]: http://www.h2database.com/
   [2]: http://localhost:11111