Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-141 - changed AsyncEventQueue package name

Browse Source
This commit is contained in:
David Turanski
2012-11-29 08:25:22 -05:00
parent 34e2c67b4e
commit 3df0e93175
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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

13
src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java
View File

@@ -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;
}

6
src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
View File

@@ -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) {

1
src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
View File

@@ -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"