You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ma...@apache.org on 2009/09/06 20:06:53 UTC
svn commit: r811848 - in /jackrabbit/sandbox/JCR-1456/jackrabbit-core:
pom.xml src/test/repository-descriptor-overlay/repository.xml
Author: martijnh
Date: Sun Sep 6 18:06:52 2009
New Revision: 811848
URL: http://svn.apache.org/viewvc?rev=811848&view=rev
Log:
JCR-1456 Database connection pooling
* Updated descriptor overlay for validation query.
Modified:
jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml?rev=811848&r1=811847&r2=811848&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml Sun Sep 6 18:06:52 2009
@@ -260,6 +260,7 @@
<config.db.pmclass>org.apache.jackrabbit.core.persistence.bundle.MySqlPersistenceManager</config.db.pmclass>
<config.db.journalclass>org.apache.jackrabbit.core.journal.DatabaseJournal</config.db.journalclass>
<config.db.schema>mysql</config.db.schema>
+ <config.db.validation.query>select 1</config.db.validation.query>
<config.db.user>user</config.db.user>
<config.db.pwd>pwd</config.db.pwd>
<config.db.driver>com.mysql.jdbc.Driver</config.db.driver>
@@ -278,6 +279,7 @@
<config.db.pmclass>org.apache.jackrabbit.core.persistence.bundle.MSSqlPersistenceManager</config.db.pmclass>
<config.db.journalclass>org.apache.jackrabbit.core.journal.MSSqlDatabaseJournal</config.db.journalclass>
<config.db.schema>mssql</config.db.schema>
+ <config.db.validation.query>select 1</config.db.validation.query>
<config.db.user>user</config.db.user>
<config.db.pwd>pwd</config.db.pwd>
<config.db.driver>net.sourceforge.jtds.jdbc.Driver</config.db.driver>
@@ -296,6 +298,7 @@
<config.db.pmclass>org.apache.jackrabbit.core.persistence.bundle.OraclePersistenceManager</config.db.pmclass>
<config.db.journalclass>org.apache.jackrabbit.core.journal.OracleDatabaseJournal</config.db.journalclass>
<config.db.schema>oracle</config.db.schema>
+ <config.db.validation.query>select 'validationQuery' from dual</config.db.validation.query>
<config.db.user>user</config.db.user>
<config.db.pwd>password</config.db.pwd>
<config.db.driver>oracle.jdbc.driver.OracleDriver</config.db.driver>
@@ -374,6 +377,7 @@
<filterset>
<filter token="repo.id" value="A" />
<filter token="config.db.schema" value="${config.db.schema}" />
+ <filter token="config.db.validation.query" value="${config.db.validation.query}" />
<filter token="config.db.driver" value="${config.db.driver}" />
<filter token="config.db.url" value="${config.db.url}" />
<filter token="config.db.user" value="${config.db.user}" />
@@ -389,6 +393,7 @@
<filterset>
<filter token="repo.id" value="B" />
<filter token="config.db.schema" value="${config.db.schema}" />
+ <filter token="config.db.validation.query" value="${config.db.validation.query}" />
<filter token="config.db.driver" value="${config.db.driver}" />
<filter token="config.db.url" value="${config.db.url}" />
<filter token="config.db.user" value="${config.db.user}" />
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml?rev=811848&r1=811847&r2=811848&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml Sun Sep 6 18:06:52 2009
@@ -28,7 +28,7 @@
<param name="user" value="@config.db.user@"/>
<param name="password" value="@config.db.pwd@"/>
<param name="databaseType" value="@config.db.schema@"/>
- <param name="validationQuery" value="select 1"/>
+ <param name="validationQuery" value="@config.db.validation.query@"/>
<param name="maxPoolSize" value="10"/>
</DataSource>
</DataSources>