Author: ate
Date: Tue Feb 26 22:52:22 2013
New Revision: 1450506
URL: http://svn.apache.org/r1450506
Log:
RAVE-901: Move database access to container provided JNDI resource
- database access configuration now is defined in the project pom.xml,
customizable there or on a child pom if needed
- JNDI resources for both Rave Shindig and Rave Portal are injected in the
Tomcat global context.xml
Modified:
rave/trunk/pom.xml
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml
rave/trunk/rave-portal-resources/src/main/resources/portal.properties
rave/trunk/rave-portal/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave.shindig.properties
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1450506&r1=1450505&r2=1450506&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Tue Feb 26 22:52:22 2013
@@ -82,11 +82,29 @@
<org.mongodb.driver.version>2.9.1</org.mongodb.driver.version>
<de.flapdoodle.embed.mongo.version>1.28</de.flapdoodle.embed.mongo.version>
+ <!-- Rave default jdbc datasource configuration -->
+
<!-- The location of Rave's H2 file DB. No trailing / -->
<rave.database.location>/tmp/rave_db</rave.database.location>
+ <rave.dataSource.driver>org.h2.Driver</rave.dataSource.driver>
+ <rave.dataSource.username>sa</rave.dataSource.username>
+ <rave.dataSource.password>local</rave.dataSource.password>
+
<rave.dataSource.url>jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE</rave.dataSource.url>
+
+ <!-- Rave Portal default jdbc datasource configuration: using rave
default configuration shared with Shindig -->
+
<portal.dataSource.driver>${rave.dataSource.driver}</portal.dataSource.driver>
+ <portal.dataSource.url>${rave.dataSource.url}</portal.dataSource.url>
+
<portal.dataSource.username>${rave.dataSource.username}</portal.dataSource.username>
+
<portal.dataSource.password>${rave.dataSource.password}</portal.dataSource.password>
+
+ <!-- Rave Shindig default jdbc datasource configuration: using rave
default configuration shared with Portal -->
+
<shindig.dataSource.driver>${rave.dataSource.driver}</shindig.dataSource.driver>
+ <shindig.dataSource.url>${rave.dataSource.url}</shindig.dataSource.url>
+
<shindig.dataSource.username>${rave.dataSource.username}</shindig.dataSource.username>
+
<shindig.dataSource.password>${rave.dataSource.password}</shindig.dataSource.password>
- <!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin
configuration with
- $mvn filesync:generate -Dmaven.filesync.override=true -->
+ <!-- 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>
<cargo.version>1.3.1</cargo.version>
Modified:
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml?rev=1450506&r1=1450505&r2=1450506&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml
Tue Feb 26 22:52:22 2013
@@ -61,11 +61,9 @@
</property>
</bean>
- <bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="url" value="${jpa.dataSource.url}"/>
- <property name="driverClassName" value="${jpa.dataSource.driver}"/>
- <property name="username" value="${jpa.dataSource.username}"/>
- <property name="password" value="${jpa.dataSource.password}"/>
- </bean>
+ <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName" value="java:comp/env/${rave.dataSource.name}"/>
+ <property name="resourceRef" value="true"/>
+ </bean>
</beans>
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/resources/portal.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/portal.properties?rev=1450506&r1=1450505&r2=1450506&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/portal.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/portal.properties Tue
Feb 26 22:52:22 2013
@@ -40,12 +40,8 @@ portal.page.default_name=Main
# Properties related to the Rave JPA implementation #
###################################################################
-# Default Rave Portal database settings with in memory H2 database
-# rave.database.location is replaced during the build
-jpa.dataSource.url=jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE
-jpa.dataSource.driver=org.h2.Driver
-jpa.dataSource.username=sa
-jpa.dataSource.password=local
+# Rave Portal database JNDI resource lookup name
+rave.dataSource.name=jdbc/ravePortalDB
jpa.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect
jpa.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
Modified: rave/trunk/rave-portal/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal/pom.xml?rev=1450506&r1=1450505&r2=1450506&view=diff
==============================================================================
--- rave/trunk/rave-portal/pom.xml (original)
+++ rave/trunk/rave-portal/pom.xml Tue Feb 26 22:52:22 2013
@@ -78,6 +78,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- log4j logging -->
@@ -173,6 +174,20 @@
</deployables>
<configuration>
<properties>
+ <cargo.datasource.datasource.portalDB>
+ cargo.datasource.jndi=jdbc/ravePortalDB|
+
cargo.datasource.driver=${portal.dataSource.driver}|
+ cargo.datasource.url=${portal.dataSource.url}|
+
cargo.datasource.username=${portal.dataSource.username}|
+
cargo.datasource.password=${portal.dataSource.password}
+ </cargo.datasource.datasource.portalDB>
+ <cargo.datasource.datasource.shindigDB>
+ cargo.datasource.jndi=jdbc/raveShindigDB|
+
cargo.datasource.driver=${shindig.dataSource.driver}|
+ cargo.datasource.url=${shindig.dataSource.url}|
+
cargo.datasource.username=${shindig.dataSource.username}|
+
cargo.datasource.password=${shindig.dataSource.password}
+ </cargo.datasource.datasource.shindigDB>
<cargo.jvmargs>
<![CDATA[-Dh2.bindAddress="localhost" -Xdebug
-XX:MaxPermSize=256m
-Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend}
-noverify ${javaagent} ${cargo.args}]]>
</cargo.jvmargs>
@@ -222,6 +237,11 @@
<artifactId>activation</artifactId>
<classpath>shared</classpath>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <classpath>extra</classpath>
+ </dependency>
</dependencies>
</container>
</configuration>
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml?rev=1450506&r1=1450505&r2=1450506&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
Tue Feb 26 22:52:22 2013
@@ -43,6 +43,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave.shindig.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave.shindig.properties?rev=1450506&r1=1450505&r2=1450506&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave.shindig.properties
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave.shindig.properties
Tue Feb 26 22:52:22 2013
@@ -33,12 +33,8 @@ shindig.contextroot=
shindig.spring.base-package=org.apache.rave
-# Default Rave Shindig database settings with in memory H2 database
-# rave.database.location is replaced during the build
-jpa.dataSource.url=jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE
-jpa.dataSource.driver=org.h2.Driver
-jpa.dataSource.username=sa
-jpa.dataSource.password=local
+# Rave Shindig database JNDI resource lookup name
+rave.dataSource.name=jdbc/raveShindigDB
jpa.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect
jpa.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
