From 3df0e931752ccbc7095c47d322bef4f042896528 Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski_at_vmware_dot_com>
Date: Thu, 29 Nov 2012 08:25:22 -0500
Subject: [PATCH] SGF-141 - changed AsyncEventQueue package name

---
 gradle.properties                                   |  2 +-
 .../data/gemfire/IndexFactoryBean.java              | 13 +++++++++++--
 .../data/gemfire/config/AbstractRegionParser.java   |  6 +++---
 .../data/gemfire/config/gateway-v7-ns.xml           |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 7cccbee1..ff73f07c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ springVersion=3.1.2.RELEASE
 springDataCommonsVersion=1.4.0.RELEASE
 log4jVersion=1.2.16
 hamcrestVersion=1.2.1
-version=1.2.1.RELEASE
+version=1.2.2.BUILD-SNAPSHOT
 gemfire.range="[6.5, 8.0)"
 cglibVersion=2.2
 mockitoVersion=1.8.5
diff --git a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java
index 4b804a68..877a64b6 100644
--- a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java
@@ -28,8 +28,13 @@ import com.gemstone.gemfire.cache.RegionService;
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.query.Index;
+import com.gemstone.gemfire.cache.query.IndexExistsException;
+import com.gemstone.gemfire.cache.query.IndexInvalidException;
+import com.gemstone.gemfire.cache.query.IndexNameConflictException;
 import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.springsource.vfabric.licensing.log.Logger;
 
 /**
  * Factory bean for easy declarative creation of GemFire Indexes.
@@ -71,7 +76,7 @@ public class IndexFactoryBean implements InitializingBean, BeanNameAware, Factor
 		index = createIndex(queryService, indexName);
 	}
 
-	private Index createIndex(QueryService queryService, String indexName) throws Exception {
+	private Index createIndex(QueryService queryService, String indexName) throws Exception  {
 		Collection<Index> indexes = queryService.getIndexes();
 
 		Index old = null;
@@ -95,13 +100,17 @@ public class IndexFactoryBean implements InitializingBean, BeanNameAware, Factor
 		}
 
 		Index index = null;
-
+		try {
 		if (StringUtils.hasText(imports)) {
 			index = queryService.createIndex(indexName, type, expression, from, imports);
 		}
 		else {
 			index = queryService.createIndex(indexName, type, expression, from);
 		}
+		
+	} catch (IndexExistsException e) {
+		 // This is ok
+	}  
 
 		return index;
 	}
diff --git a/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
index fe65f1b3..69b58c42 100644
--- a/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
@@ -142,10 +142,10 @@ abstract class AbstractRegionParser extends AliasReplacingBeanDefinitionParser {
 
 		// Parse child elements
 
+	 	parseCollectionOfCustomSubElements(parserContext, element, builder,
+				"com.gemstone.gemfire.cache.wan.GatewaySender", "gateway-sender","gatewaySenders");
 		parseCollectionOfCustomSubElements(parserContext, element, builder,
-				"com.gemstone.gemfire.cache.wan.GatewaySender", "gateway-sender", "gatewaySenders");
-		parseCollectionOfCustomSubElements(parserContext, element, builder,
-				"com.gemstone.gemfire.cache.wan.AsyncEventQueue", "async-event-queue", "asyncEventQueues");
+				"com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue", "async-event-queue", "asyncEventQueues");
 
 		List<Element> subElements = DomUtils.getChildElements(element);
 		for (Element subElement : subElements) {
diff --git a/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
index fbdddb1a..3fea7822 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
@@ -34,6 +34,7 @@
             </gfe:transport-filter>
         </gfe:gateway-sender>
         <gfe:gateway-sender-ref bean="gateway-sender"/>
+        <gfe:async-event-queue-ref bean="async-event-queue"/>
     </gfe:partitioned-region>
     
     <gfe:async-event-queue id="async-event-queue" batch-size="10" persistent="true" disk-store-ref="diskstore"