From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Sun, 22 Feb 2015 20:10:22 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/gumartinm/JavaForFun
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=b3259c2bd2a38d224e3c3d7aeba4ea6155935402;p=JavaForFun

Merge branch 'master' of https://github.com/gumartinm/JavaForFun

Conflicts:
	MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
---

b3259c2bd2a38d224e3c3d7aeba4ea6155935402
diff --cc MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
index 27a2ea2,d3ed00f..145d172
--- a/MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
+++ b/MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
@@@ -111,9 -111,8 +111,12 @@@
          <property name="adMapper" ref="adMapper" />
      </bean>
  
+     <bean id="exampleCustomService" class="de.example.mybatis.spring.service.ExampleCustomService">
+         <property name="adCustomMapper" ref="adCustomMapper" />
+     </bean>
 -    
++
 +    <bean id="liquibase" class="liquibase.integration.spring.SpringLiquibase">
 +        <property name="dataSource" ref="dataSource" />
 +        <property name="changeLog" value="classpath:/liquibase/liquibaseChangeLogs.xml" />
 +    </bean>
-     
  </beans>