Minor updates for 1.1.1 release

emacarron · emacarron · commit feddf83a9e2c · 2012-04-15T18:09:44.000Z
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2010-2012 The myBatis Team Licensed under the Apache License, 
-	Version 2.0 (the "License"); you may not use this file except in compliance 
-	with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
-	OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
-	the specific language governing permissions and limitations under the License. -->
+<!--
+  Copyright 2010-2012 The myBatis Team
 
-<!-- version: $Id: changes.xml 3985 2011-10-25 05:08:54Z eduardo.macarron 
-	$ -->
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- version: $Id$ -->
 <document xmlns="http://maven.apache.org/changes/1.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
@@ -18,7 +25,16 @@
 	</properties>
 
 	<body>
-		<release version="1.1.1" date="TBD" description="1.1.1 release">
+		<release version="1.1.1" date="2012-04-15" description="1.1.1 release">
+			<action type="fix" issue="553">
+				2nd level cache consistency with MyBatis-Spring
+			</action>
+			<action type="fix" issue="559">
+				Overriding sqlSessionTemplate in MapperFactoryBean not working in certain circumstances
+			</action>
+			<action type="fix" issue="572">
+				MapperScannerConfigurer causes app initialization problems
+			</action>
 		</release>
 		<release version="1.1.0" date="2012-03-12" description="1.1.0 release">
 			<action type="fix" issue="449">
diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java
@@ -117,7 +117,7 @@ public class MapperScannerConfigurer implements BeanDefinitionRegistryPostProces
 
   private String beanName;
 
-  private boolean processPropertyHolders;
+  private boolean processPropertyPlaceHolders;
   
   /**
    * This property lets you set the base package for your mapper interface files.
@@ -234,12 +234,12 @@ public void setSqlSessionFactoryBeanName(String sqlSessionFactoryName) {
 
   /**
    * 
-   * @since 1.1.0
+   * @since 1.1.1
    * 
-   * @param processPropertyHolders
+   * @param processPropertyPlaceHolders
    */
-  public void setProcessPropertyHolders(boolean processPropertyHolders) {
-    this.processPropertyHolders = processPropertyHolders;
+  public void setProcessPropertyPlaceHolders(boolean processPropertyPlaceHolders) {
+    this.processPropertyPlaceHolders = processPropertyPlaceHolders;
   }
 
   /**
@@ -273,7 +273,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
    * {@inheritDoc}
    */
   public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry beanDefinitionRegistry) throws BeansException {
-    if (this.processPropertyHolders) {
+    if (this.processPropertyPlaceHolders) {
       processPropertyPlaceHolders();
     }
 
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java
@@ -207,7 +207,7 @@ public void testScanWithPropertyPlaceholders() {
     // use a property placeholder for basePackage
     definition.getPropertyValues().removePropertyValue("basePackage");
     definition.getPropertyValues().add("basePackage", "${basePackageProperty}");
-    definition.getPropertyValues().add("processPropertyHolders", true);
+    definition.getPropertyValues().add("processPropertyPlaceHolders", true);
 
     // also use a property placeholder for an SqlSessionFactory property
     // to make sure the configLocation was setup correctly and MapperScanner did not change
