svn commit: r1563097 - /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java

[ma...@apache.org]

Author: markt
Date: Fri Jan 31 09:46:14 2014
New Revision: 1563097

URL: http://svn.apache.org/r1563097
Log:
Complete DBCP-348 - clarify differences between setting connectionInitSqls on BasicDataSourceFactory and BasicDataSource.

Modified:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1563097&r1=1563096&r2=1563097&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java Fri Jan 31 09:46:14 2014
@@ -37,9 +37,14 @@ import javax.sql.DataSource;
 /**
  * <p>JNDI object factory that creates an instance of
  * <code>BasicDataSource</code> that has been configured based on the
- * <code>RefAddr</code> values of the specified <code>Reference</code>,
- * which must match the names and data types of the
- * <code>BasicDataSource</code> bean properties.</p>
+ * <code>RefAddr</code> values of the specified <code>Reference</code>, which
+ * must match the names and data types of the <code>BasicDataSource</code> bean
+ * properties with the following exceptions:</p>
+ * <ul>
+ * <li><code>connectionInitSqls</code> must be passed to this factory as a
+ *     single String using semi-colon to delimt the statements whereas
+ *     <code>BasicDataSource</code> requires a collection of Strings.</li>
+ * </ul>
  *
  * @author Craig R. McClanahan
  * @author Dirk Verbeeck