svn commit: r1770181 - in /tomee/site/trunk/content: datasource-config.mdtext datasource-configuration-by-creator.md

[jg...@apache.org]

Author: jgallimore
Date: Thu Nov 17 12:59:59 2016
New Revision: 1770181

URL: http://svn.apache.org/viewvc?rev=1770181&view=rev
Log:
Updating properties for DBCP2

Modified:
    tomee/site/trunk/content/datasource-config.mdtext
    tomee/site/trunk/content/datasource-configuration-by-creator.md

Modified: tomee/site/trunk/content/datasource-config.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/datasource-config.mdtext?rev=1770181&r1=1770180&r2=1770181&view=diff
==============================================================================
--- tomee/site/trunk/content/datasource-config.mdtext (original)
+++ tomee/site/trunk/content/datasource-config.mdtext Thu Nov 17 12:59:59 2016
@@ -179,7 +179,7 @@ or user managed.
   <td>
 The maximum number of active connections that can be
 allocated from this pool at the same time, or a negative
-number for no limit.
+number for no limit. N.B. When using dbcp2 with TomEE 7 ("DataSourceCreator dbcp"), "MaxTotal" should be used as opposed to "MaxActive".
 </td>
 </tr>
 <tr>

Modified: tomee/site/trunk/content/datasource-configuration-by-creator.md
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/datasource-configuration-by-creator.md?rev=1770181&r1=1770180&r2=1770181&view=diff
==============================================================================
--- tomee/site/trunk/content/datasource-configuration-by-creator.md (original)
+++ tomee/site/trunk/content/datasource-configuration-by-creator.md Thu Nov 17 12:59:59 2016
@@ -23,7 +23,6 @@ Note: details are http://tomee.apache.or
 - DefaultCatalog
 - DefaultReadOnly
 - DefaultTransactionIsolation
-- DefaultTransactionIsolation
 - Delegate
 - InitialSize
 - JdbcDriver
@@ -35,7 +34,6 @@ Note: details are http://tomee.apache.or
 - MaxIdle
 - MaxOpenPreparedStatements
 - MaxWait
-- MaxWait
 - MinEvictableIdleTimeMillis
 - MinIdle
 - Name
@@ -110,4 +108,45 @@ Note: details are https://tomcat.apache.
 - ValidationQuery
 - ValidationQueryTimeout
 - Validator
-- ValidatorClassName
\ No newline at end of file
+- ValidatorClassName
+
+## DBCP2 (TomEE 7.x)
+
+Note: details are http://tomee.apache.org/containers-and-resources.html
+(note: http://commons.apache.org/proper/commons-dbcp/configuration.html uses the last version of DBCP but we didnt upgrade yet).
+
+- AccessToUnderlyingConnectionAllowed
+- ConnectionInitSqls
+- ConnectionProperties
+- DefaultAutoCommit
+- DefaultCatalog
+- DefaultReadOnly
+- DefaultTransactionIsolation
+- Delegate
+- InitialSize
+- JdbcDriver
+- JdbcUrl
+- LogAbandoned
+- LogWriter
+- LoginTimeout
+- MaxTotal
+- MaxIdle
+- MaxOpenPreparedStatements
+- MaxWait
+- MinEvictableIdleTimeMillis
+- MinIdle
+- Name
+- NumTestsPerEvictionRun
+- Password
+- PasswordCipher
+- PoolPreparedStatements
+- RemoveAbandonedOnBorrow
+- RemoveAbandonedOnMaintenance
+- RemoveAbandonedTimeout
+- TestOnBorrow
+- TestOnReturn
+- TestWhileIdle
+- TimeBetweenEvictionRunsMillis
+- UserName
+- ValidationQuery
+- ValidationQueryTimeout
\ No newline at end of file