You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2005/10/03 03:24:53 UTC
svn commit: r293198 - in /ibatis/trunk/java/mapper/mapper2:
build/version.properties
src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
test/com/ibatis/sqlmap/maps/SqlMapConfig.properties
test/com/ibatis/sqlmap/maps/SqlMapConfig.xml
Author: cbegin
Date: Sun Oct 2 18:24:44 2005
New Revision: 293198
URL: http://svn.apache.org/viewcvs?rev=293198&view=rev
Log:
Fixed IBATIS 196 can't use dynamic replace data-source-type over IBATIS ver 2.0.9 library
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.properties
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.xml
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=293198&r1=293197&r2=293198&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Sun Oct 2 18:24:44 2005
@@ -1,5 +1,5 @@
#Build version info
-#Sun Jul 17 21:31:13 MDT 2005
+#Sun Oct 02 19:06:43 MDT 2005
version=2.1.5
-buildDate=2005/07/17 21\:31
-buildNum=583
+buildDate=2005/10/02 19\:06
+buildNum=584
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java?rev=293198&r1=293197&r2=293198&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java Sun Oct 2 18:24:44 2005
@@ -289,7 +289,7 @@
public void process(Node node) throws Exception {
vars.errorCtx.setActivity("configuring the data source");
- Properties attributes = NodeletUtils.parseAttributes(node);
+ Properties attributes = NodeletUtils.parseAttributes(node, vars.properties);
String type = attributes.getProperty("type");
type = vars.typeHandlerFactory.resolveAlias(type);
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.properties
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.properties?rev=293198&r1=293197&r2=293198&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.properties Sun Oct 2 18:24:44 2005
@@ -4,4 +4,4 @@
password=
SqlMapPath=com/ibatis/sqlmap/maps
-
+dataSourceType=SIMPLE
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.xml?rev=293198&r1=293197&r2=293198&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/maps/SqlMapConfig.xml Sun Oct 2 18:24:44 2005
@@ -27,7 +27,7 @@
<typeHandler javaType="boolean" jdbcType="VARCHAR" callback="OuiNonBool"/>
<transactionManager type="JDBC" commitRequired="false">
- <dataSource type="SIMPLE">
+ <dataSource type="${dataSourceType}">
<property name="JDBC.Driver" value="${driver}"/>
<property name="JDBC.ConnectionURL" value="${url}"/>
<property name="JDBC.Username" value="${username}"/>