You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by bg...@apache.org on 2005/04/08 20:19:53 UTC
svn commit: r160575 - in incubator/ibatis/trunk/java/mapper/mapper2:
build/version.properties src/com/ibatis/common/jdbc/DbcpConfiguration.java
Author: bgoodin
Date: Fri Apr 8 11:19:52 2005
New Revision: 160575
URL: http://svn.apache.org/viewcvs?view=rev&rev=160575
Log:
- added test for issue IBATIS-42
- IBATIS-78 added fix to DbcpConfiguration that allows you to pass in connection properties using the old "Driver.[name]" notation.
Modified:
incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties
incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java
Modified: incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties?view=diff&r1=160574&r2=160575
==============================================================================
--- incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties Fri Apr 8 11:19:52 2005
@@ -1,4 +1,4 @@
#Build version info
-#Fri Apr 08 10:06:26 MDT 2005
-buildDate=2005/04/08 10\:06
-buildNum=556
+#Fri Apr 08 12:00:01 MDT 2005
+buildDate=2005/04/08 12\:00
+buildNum=557
Modified: incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java?view=diff&r1=160574&r2=160575
==============================================================================
--- incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java (original)
+++ incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java Fri Apr 8 11:19:52 2005
@@ -30,7 +30,8 @@
public class DbcpConfiguration {
private static final Probe PROBE = ProbeFactory.getProbe();
-
+ private static final String ADD_DRIVER_PROPS_PREFIX = "Driver.";
+ private static final int ADD_DRIVER_PROPS_PREFIX_LENGTH = ADD_DRIVER_PROPS_PREFIX.length();
private DataSource dataSource;
/**
@@ -65,7 +66,10 @@
Iterator props = map.keySet().iterator();
while (props.hasNext()) {
String propertyName = (String) props.next();
- if (PROBE.hasWritableProperty(basicDataSource, propertyName)) {
+ if (propertyName.startsWith(ADD_DRIVER_PROPS_PREFIX)) {
+ String value = (String) map.get(propertyName);
+ basicDataSource.addConnectionProperty(propertyName.substring(ADD_DRIVER_PROPS_PREFIX_LENGTH), value);
+ } else if (PROBE.hasWritableProperty(basicDataSource, propertyName)) {
String value = (String) map.get(propertyName);
Object convertedValue = convertValue(basicDataSource, propertyName, value);
PROBE.setObject(basicDataSource, propertyName, convertedValue);