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 2008/11/09 02:47:03 UTC
svn commit: r712465 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src:
main/java/org/apache/ibatis/builder/MapperConfigParser.java
test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
Author: cbegin
Date: Sat Nov 8 17:47:03 2008
New Revision: 712465
URL: http://svn.apache.org/viewvc?rev=712465&view=rev
Log:
set parser variables appropriately
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java?rev=712465&r1=712464&r2=712465&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java Sat Nov 8 17:47:03 2008
@@ -98,6 +98,7 @@
if (vars != null) {
defaults.putAll(vars);
}
+ parser.setVariables(defaults);
configuration.setVariables(defaults);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java?rev=712465&r1=712464&r2=712465&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java Sat Nov 8 17:47:03 2008
@@ -16,21 +16,21 @@
@Test
public void shouldBuildBlogMappers() throws Exception {
-// createBlogDataSource();
-// final String resource = "org/apache/ibatis/builder/MapperConfig.xml";
-// final Reader reader = Resources.getResourceAsReader(resource);
-// MapperConfigParser parser = new MapperConfigParser(reader,null);
-//
-// parser.parse();
-// Configuration config = parser.getConfiguration();
-//
-// DataSource ds = config.getEnvironment().getDataSource();
-// TransactionFactory tf = config.getEnvironment().getTransactionFactory();
-// MappedStatement ms = config.getMappedStatement("selectAllAuthors");
-// Transaction tx = tf.newTransaction(ds.getConnection());
+ createBlogDataSource();
+ final String resource = "org/apache/ibatis/builder/MapperConfig.xml";
+ final Reader reader = Resources.getResourceAsReader(resource);
+ MapperConfigParser parser = new MapperConfigParser(reader,null);
+ parser.parse();
+ Configuration config = parser.getConfiguration();
- //Assert.assertEquals(1,config.getCaches().size());
+ DataSource ds = config.getEnvironment().getDataSource();
+ TransactionFactory tf = config.getEnvironment().getTransactionFactory();
+ MappedStatement ms = config.getMappedStatement("selectAllAuthors");
+ Transaction tx = tf.newTransaction(ds.getConnection());
+
+
+// Assert.assertEquals(1,config.getCaches().size());
}
}