Post-merge (cherry-pick) cleanup, fixing test failures and merge change conflicts.

src/main/java/org/springframework/data/gemfire/support/JSONRegionAdvice.java

@@ -25,10 +25,10 @@ import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.data.gemfire.GemfireTemplate;
 import org.springframework.util.CollectionUtils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.internal.ResultsBag;
@@ -41,11 +41,14 @@ import com.gemstone.gemfire.pdx.PdxInstance;
  */
 @Aspect
 public class JSONRegionAdvice {
+
 	private static Log log = LogFactory.getLog(JSONRegionAdvice.class);
-	private List<String> includedRegions;
+
 	private boolean convertReturnedCollections = true;
 	private boolean prettyPrint = false;
 
+	private List<String> includedRegions;
+
 	/**
 	 * Sets names of regions to be included for JSON conversion. By default, all regions will be included
 	 * @param regionNames a List of region names to include
@@ -276,4 +279,5 @@ public class JSONRegionAdvice {
 		}
 
 	}
+
 }

src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java

@@ -57,9 +57,8 @@ import com.gemstone.gemfire.cache.util.ObjectSizer;
  * @author David Turanski
  * @author John Blum
  */
-@ContextConfiguration(locations="/org/springframework/data/gemfire/config/client-ns.xml",
-	initializers=GemfireTestApplicationContextInitializer.class)
 @RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations="client-ns.xml", initializers=GemfireTestApplicationContextInitializer.class)
 @SuppressWarnings("unused")
 public class ClientRegionNamespaceTest {
 

src/test/java/org/springframework/data/gemfire/config/TemplateClientRegionNamespaceTest.java

@@ -133,7 +133,6 @@ public class TemplateClientRegionNamespaceTest {
 		assertNotNull("The Region must not be null!", region);
 		assertNotNull(String.format("The Region (%1$s) must have 'RegionAttributes' defined!",
 			region.getFullPath()), region.getAttributes());
-		assertNull(region.getAttributes().getCompressor());
 		assertNull(region.getAttributes().getCustomEntryIdleTimeout());
 		assertNull(region.getAttributes().getCustomEntryTimeToLive());
 		assertNull(region.getAttributes().getDiskStoreName());

src/test/java/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests.java

@@ -236,7 +236,6 @@ public class TemplateRegionsNamespaceTests {
 		assertNotNull("The Region must not be null!", region);
 		assertNotNull(String.format("The Region (%1$s) must have 'RegionAttributes' defined!",
 			region.getFullPath()), region.getAttributes());
-		assertNull(region.getAttributes().getCompressor());
 		assertNull(region.getAttributes().getCustomEntryIdleTimeout());
 		assertNull(region.getAttributes().getCustomEntryTimeToLive());
 		assertNull(region.getAttributes().getDiskStoreName());

src/test/resources/autoregionlookup-cache.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE cache PUBLIC  "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
-	"http://www.gemstone.com/dtd/cache8_0.dtd">
+	"http://www.gemstone.com/dtd/cache7_0.dtd">
 <cache>
 	<region name="NativePartitionedRegion" refid="PARTITION"/>
 

src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml

@@ -18,14 +18,14 @@
 
 	<gfe:cache properties-ref="gemfireProperties"/>
 
-	<gfe:async-event-queue id="TestAsyncEventQueue" persistent="false" parallel="true" dispatcher-threads="4">
+	<gfe:async-event-queue id="TestAsyncEventQueue" persistent="false" parallel="false" dispatcher-threads="4">
 		<gfe:async-event-listener>
 			<bean class="org.springframework.data.gemfire.config.TemplateRegionsNamespaceTests$TestAsyncEventListener"/>
 		</gfe:async-event-listener>
 	</gfe:async-event-queue>
 
 	<gfe:gateway-sender id="TestGatewaySender" remote-distributed-system-id="123" manual-start="true" persistent="false"
-						parallel="true" dispatcher-threads="8"/>
+						parallel="false" dispatcher-threads="8"/>
 
 	<!-- Template Regions -->
 

src/test/resources/org/springframework/data/gemfire/config/client-ns.xml

@@ -63,6 +63,5 @@
 					   value-constraint="java.lang.String"/>
 
 	<bean id="c-listener" class="org.springframework.data.gemfire.SimpleCacheListener"/>
-	<bean id="testCompressor" class="org.springframework.data.gemfire.config.ClientRegionNamespaceTest$TestCompressor" p:name="STD"/>
 
 </beans>