rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r1200379 - in /incubator/rave/trunk: pom.xml rave-portal-resources/src/main/resources/portal.properties rave-shindig/src/main/resources/rave.shindig.properties
Date Thu, 10 Nov 2011 15:27:11 GMT
Author: jasha
Date: Thu Nov 10 15:27:10 2011
New Revision: 1200379

URL: http://svn.apache.org/viewvc?rev=1200379&view=rev
Log:
RAVE-353 use a less confusing name for the database location

Modified:
    incubator/rave/trunk/pom.xml
    incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties
    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=1200379&r1=1200378&r2=1200379&view=diff
==============================================================================
--- incubator/rave/trunk/pom.xml (original)
+++ incubator/rave/trunk/pom.xml Thu Nov 10 15:27:10 2011
@@ -71,8 +71,8 @@
         <org.hamcrest.version>1.1</org.hamcrest.version>
         <tiles.version>2.2.2</tiles.version>
 
-		  <!-- The location of Rave's H2 file DB. No trailing / -->
-		  <portal.datasource.url>/tmp/rave_portal_data</portal.datasource.url>
+        <!-- The location of Rave's H2 file DB. No trailing / -->
+        <rave.database.location>/tmp/rave_db</rave.database.location>
 
         <!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin configuration
with
             $mvn filesync:generate -Dmaven.filesync.override=true -->

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=1200379&r1=1200378&r2=1200379&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 Thu Nov
10 15:27:10 2011
@@ -34,7 +34,8 @@ 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:${portal.datasource.url};AUTO_SERVER=TRUE
+# rave.database.location is replaced during the build
+portal.dataSource.url=jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE
 portal.dataSource.driver=org.h2.Driver
 portal.dataSource.username=sa
 portal.dataSource.password=local

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=1200379&r1=1200378&r2=1200379&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 Thu Nov 10
15:27:10 2011
@@ -28,7 +28,8 @@ 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:${portal.datasource.url};AUTO_SERVER=TRUE
+# rave.database.location is replaced during the build
+rave-shindig.dataSource.url=jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE
 rave-shindig.dataSource.driver=org.h2.Driver
 rave-shindig.dataSource.username=sa
 rave-shindig.dataSource.password=local



Mime
View raw message