You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mp...@apache.org on 2011/11/09 00:43:56 UTC
svn commit: r1199538 - in /incubator/rave/trunk: pom.xml
rave-portal-resources/pom.xml
rave-portal-resources/src/main/resources/portal.properties
rave-shindig/pom.xml rave-shindig/src/main/resources/rave.shindig.properties
Author: mpierce
Date: Tue Nov 8 23:43:56 2011
New Revision: 1199538
URL: http://svn.apache.org/viewvc?rev=1199538&view=rev
Log:
(RAVE-353) Use common h2 database. See http://www.h2database.com/html/features.html#auto_mixed_mode for explanation of the connection settings.
Modified:
incubator/rave/trunk/pom.xml
incubator/rave/trunk/rave-portal-resources/pom.xml
incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties
incubator/rave/trunk/rave-shindig/pom.xml
incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties
Modified: incubator/rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/pom.xml?rev=1199538&r1=1199537&r2=1199538&view=diff
==============================================================================
--- incubator/rave/trunk/pom.xml (original)
+++ incubator/rave/trunk/pom.xml Tue Nov 8 23:43:56 2011
@@ -69,6 +69,9 @@
<cobertura.version>2.5.1</cobertura.version>
<org.hamcrest.version>1.1</org.hamcrest.version>
+ <!-- The location of Rave's H2 file DB. No trailing / -->
+ <portal.datasource.url>/tmp/rave_portal_data</portal.datasource.url>
+
<!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin configuration with
$mvn filesync:generate -Dmaven.filesync.override=true -->
<maven.filesync.override>false</maven.filesync.override>
Modified: incubator/rave/trunk/rave-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/pom.xml?rev=1199538&r1=1199537&r2=1199538&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/pom.xml (original)
+++ incubator/rave/trunk/rave-portal-resources/pom.xml Tue Nov 8 23:43:56 2011
@@ -61,8 +61,14 @@
</dependency>
</dependencies>
- <build>
- <plugins>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
<plugin>
<groupId>com.googlecode.mavenfilesync</groupId>
<artifactId>maven-filesync-plugin</artifactId>
Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties?rev=1199538&r1=1199537&r2=1199538&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties Tue Nov 8 23:43:56 2011
@@ -34,7 +34,7 @@ portal.opensocial_security.domain=defaul
portal.page.default_name=Main
#Default Rave Portal database settings with in memory H2 database
-portal.dataSource.url=jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1
+portal.dataSource.url=jdbc:h2:${portal.datasource.url};AUTO_SERVER=TRUE
portal.dataSource.driver=org.h2.Driver
portal.dataSource.username=sa
portal.dataSource.password=local
Modified: incubator/rave/trunk/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/pom.xml?rev=1199538&r1=1199537&r2=1199538&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/pom.xml (original)
+++ incubator/rave/trunk/rave-shindig/pom.xml Tue Nov 8 23:43:56 2011
@@ -149,6 +149,13 @@
<build>
<defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties?rev=1199538&r1=1199537&r2=1199538&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties (original)
+++ incubator/rave/trunk/rave-shindig/src/main/resources/rave.shindig.properties Tue Nov 8 23:43:56 2011
@@ -28,7 +28,7 @@ shindig.contextroot=
shindig.spring.base-package=org.apache.rave
# Default Rave Shindig database settings with in memory H2 database
-rave-shindig.dataSource.url=jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1
+rave-shindig.dataSource.url=jdbc:h2:${portal.datasource.url};AUTO_SERVER=TRUE
rave-shindig.dataSource.driver=org.h2.Driver
rave-shindig.dataSource.username=sa
rave-shindig.dataSource.password=local