Merge pull request #105 from eddumelendez/gh-104

Add vfsImpl property in SqlSessionFactoryBean

Author: emacarron

src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java

@@ -29,6 +29,7 @@
 import org.apache.ibatis.builder.xml.XMLConfigBuilder;
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.DatabaseIdProvider;
@@ -64,7 +65,8 @@
  * @author Putthibong Boonbong
  * @author Hunter Presnall
  * @author Eduardo Macarron
- * 
+ * @author Eddú Meléndez
+ *
  * @see #setConfigLocation
  * @see #setDataSource
  * @version $Id$
@@ -107,13 +109,15 @@ public class SqlSessionFactoryBean implements FactoryBean<SqlSessionFactory>, In
   //issue #19. No default provider.
   private DatabaseIdProvider databaseIdProvider;
 
+  private Class<? extends VFS> vfs;
+
   private ObjectFactory objectFactory;
 
   private ObjectWrapperFactory objectWrapperFactory;
 
   /**
    * Sets the ObjectFactory.
-   * 
+   *
    * @since 1.1.2
    * @param objectFactory
    */
@@ -123,7 +127,7 @@ public void setObjectFactory(ObjectFactory objectFactory) {
 
   /**
    * Sets the ObjectWrapperFactory.
-   * 
+   *
    * @since 1.1.2
    * @param objectWrapperFactory
    */
@@ -143,7 +147,7 @@ public DatabaseIdProvider getDatabaseIdProvider() {
 
   /**
    * Sets the DatabaseIdProvider.
-   * As of version 1.2.2 this variable is not initialized by default. 
+   * As of version 1.2.2 this variable is not initialized by default.
    *
    * @since 1.1.0
    * @param databaseIdProvider
@@ -152,6 +156,14 @@ public void setDatabaseIdProvider(DatabaseIdProvider databaseIdProvider) {
     this.databaseIdProvider = databaseIdProvider;
   }
 
+  public Class<? extends VFS> getVfs() {
+    return this.vfs;
+  }
+
+  public void setVfs(Class<? extends VFS> vfs) {
+    this.vfs = vfs;
+  }
+
   /**
    * Mybatis plugin list.
    *
@@ -425,15 +437,19 @@ protected SqlSessionFactory buildSqlSessionFactory() throws IOException {
         }
       }
     }
-    
+
     if (this.databaseIdProvider != null) {//fix #64 set databaseId before parse mapper xmls
       try {
         configuration.setDatabaseId(this.databaseIdProvider.getDatabaseId(this.dataSource));
       } catch (SQLException e) {
         throw new NestedIOException("Failed getting a databaseId", e);
       }
     }
-    
+
+    if (this.vfs != null) {
+      configuration.setVfsImpl(this.vfs);
+    }
+
     if (xmlConfigBuilder != null) {
       try {
         xmlConfigBuilder.parse();

src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java

@@ -20,6 +20,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.apache.ibatis.io.JBoss6VFS;
 import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
 import org.apache.ibatis.reflection.factory.ObjectFactory;
 import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
@@ -136,6 +137,7 @@ public void testSetConfigLocation() throws Exception {
     assertSame(factory.getConfiguration().getEnvironment().getDataSource(), dataSource);
     assertSame(factory.getConfiguration().getEnvironment().getTransactionFactory().getClass(),
         org.mybatis.spring.transaction.SpringManagedTransactionFactory.class);
+    assertSame(factory.getConfiguration().getVfsImpl(), JBoss6VFS.class);
 
     // properties explicitly set differently than the defaults in the config xml
     assertFalse(factory.getConfiguration().isCacheEnabled());

src/test/java/org/mybatis/spring/mybatis-config.xml

@@ -28,6 +28,7 @@
         <setting name="cacheEnabled" value="false" />
         <setting name="useGeneratedKeys" value="true" />
         <setting name="defaultExecutorType" value="REUSE" />
+        <setting name="vfsImpl" value="org.apache.ibatis.io.JBoss6VFS"/>
     </settings>
 
     <mappers>