-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ah--I'll clean that up.


Marlon


On 11/22/11 11:46 AM, Jasha Joachimsthal wrote:
> Good one!
> Alhough it is still configured in
> http://svn.apache.org/repos/asf/incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
> 
> Jasha
> 
> On 22 November 2011 17:41, <[email protected]> wrote:
> 
>> Author: mpierce
>> Date: Tue Nov 22 16:41:29 2011
>> New Revision: 1205072
>>
>> URL: http://svn.apache.org/viewvc?rev=1205072&view=rev
>> Log:
>> (RAVE-351) Updating Rave default database configuration information.
>>
>> 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=1205072&r1=1205071&r2=1205072&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext
>> (original)
>> +++
>> incubator/rave/site/trunk/content/rave/documentation/configure-database.mdtext
>> Tue Nov 22 16:41:29 2011
>> @@ -17,7 +17,8 @@ Notice:    Licensed to the Apache Softwa
>>            under the License.
>>
>>  ## Default setup
>> -In the default setup Rave uses an in memory [H2 database][1].
>> +In the default setup, Rave uses a file-based [H2 database][1]. Rave and
>> Shindig run in the same Tomcat server as
>> +separate web applications but share data, so we use H2's [Automatic Mixed
>> Mode][2].
>>
>>  ### Filling the default database
>>  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.
>> @@ -42,11 +43,11 @@ When the application is running, the H2
>>         <constructor-arg value="-web,-webPort,11111"/>
>>     </bean>
>>
>> -The default username is `sa`, password `local`.
>> -
>> -  - Portal database: [http://localhost:11111][2].
>> -  - Shindig database: [http://localhost:22222][3].
>> -
>> +Both Rave and Shindig are accessible from the database:
>> [http://localhost:11111][3].  The default
>> +username is `sa`, password is `local`, and JDBC URL is
>> `jdbc:h2:file:///tmp/rave_db`.  You can change the file location
>> +for both databases by editing Rave's top level pom.xml file. Change the
>> property `rave.database.location` to the desired
>> +value.
>> +
>>  ## Setup a different database
>>
>>  First start with [extending Rave][4].
>> @@ -131,6 +132,6 @@ Rave Shindig:
>>   - 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
>> -  [3]: http://localhost:22222
>> +  [2]: http://www.h2database.com/html/features.html#auto_mixed_mode
>> +  [3]: http://localhost:11111
>>   [4]: rave-extensions.html
>> \ No newline at end of file
>>
>>
>>
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.16 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJOy9MkAAoJEEfVXEODPFIDclEH/2P6NTCd+RpbuUyq95Q3y8Ec
/c/+2ES3tIW+R3AOAJlP0yBgSWBR7HTnTFB4Imd0kvpJc9zQ7NC2BtFXzMKgMJvb
Z6GKWByVM8qxgbbnrs5qLjGAArFCG8X7Qpoxfp+wJXh+BtLsZ/CKdxOafPjhx5vz
mrIhHW1CLT0xEOT1Zd3jkSUQtePDjR+1OCFm18GgZwVTwMrtldLgAQop8B+TdHAX
dBBGAA7z4Nfp6HE1GIxtG8ZYP5Wof+NI85OI8vtgnbMnj0990S5Ujo5o0EZR3GQQ
dAEOG+4gjqeLIw1bk67Utk6EtB0jBSJFU5IQkRgIgmN+K5zRcnxRwYtWmKS34XA=
=SH1P
-----END PGP SIGNATURE-----

Reply via email to