Updated copyright, fixed support for transaction handlers, added initializers

2012-06-28 13:32:05 -04:00
parent 7efa90800f
commit 1467ec0668
94 changed files with 1911 additions and 1693 deletions
--- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@

 package org.springframework.data.gemfire;

+import java.util.List;
 import java.util.Properties;

 import org.apache.commons.logging.Log;
@@ -33,12 +34,17 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;

 import com.gemstone.gemfire.GemFireException;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.CacheTransactionManager;
+import com.gemstone.gemfire.cache.Declarable;
 import com.gemstone.gemfire.cache.GemFireCache;
+import com.gemstone.gemfire.cache.TransactionListener;
+import com.gemstone.gemfire.cache.TransactionWriter;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -64,7 +70,6 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
 */
 public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanClassLoaderAware, DisposableBean,
 		InitializingBean, FactoryBean<GemFireCache>, PersistenceExceptionTranslator {
-
 	/**
 	 * Inner class to avoid a hard dependency on the GemFire 6.6 API.
 	 * 
@@ -120,6 +125,12 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 			if (messageSyncInterval != null) {
 				cacheImpl.setMessageSyncInterval(messageSyncInterval);
 			}
+
+			if (initializer != null) {
+				// Props are null because already configured in Spring
+				cacheImpl.setInitializer(initializer, null);
+			}
+
 		}
 	}

@@ -162,6 +173,12 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl

 	protected Integer searchTimeout;

+	protected List<TransactionListener> transactionListeners;
+
+	protected TransactionWriter transactionWriter;
+
+	protected Declarable initializer;
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		// initialize locator
@@ -217,16 +234,41 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 			if (cacheXml != null) {
 				cache.loadCacheXml(cacheXml.getInputStream());

-				if (log.isDebugEnabled())
+				if (log.isDebugEnabled()) {
 					log.debug("Initialized cache from " + cacheXml);
+				}
 			}

+			registerTransactionListeners();
+			registerTransactionWriter();
+
 		}
 		finally {
 			th.setContextClassLoader(oldTCCL);
 		}
 	}

+	/**
+	 * Register a transaction writer if declared
+	 */
+	protected void registerTransactionWriter() {
+		if (transactionWriter != null) {
+			cache.getCacheTransactionManager().setWriter(transactionWriter);
+		}
+	}
+
+	/**
+	 * Register all declared transaction listeners
+	 */
+	protected void registerTransactionListeners() {
+		if (!CollectionUtils.isEmpty(transactionListeners)) {
+			CacheTransactionManager txManager = cache.getCacheTransactionManager();
+			for (TransactionListener transactionListener : transactionListeners) {
+				txManager.addListener(transactionListener);
+			}
+		}
+	}
+
 	/**
 	 * Sets the PDX properties for the given object. Note this is implementation
 	 * specific as it depends on the type of the factory passed in.
@@ -429,4 +471,16 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 		this.searchTimeout = searchTimeout;
 	}

+	public void setTransactionListeners(List<TransactionListener> transactionListeners) {
+		this.transactionListeners = transactionListeners;
+	}
+
+	public void setTransactionWriter(TransactionWriter transactionWriter) {
+		this.transactionWriter = transactionWriter;
+	}
+
+	public void setInitializer(Declarable initializer) {
+		this.initializer = initializer;
+	}
+
 }
--- a/src/main/java/org/springframework/data/gemfire/DeclarableSupport.java
+++ b/src/main/java/org/springframework/data/gemfire/DeclarableSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,18 +25,21 @@ import com.gemstone.gemfire.cache.CacheCallback;
 import com.gemstone.gemfire.cache.Declarable;

 /**
- * Convenience class for Spring-aware GemFire Declarable components.
- * Provides a reference to the current Spring application context, e.g. for bean lookup or resource loading.
+ * Convenience class for Spring-aware GemFire Declarable components. Provides a
+ * reference to the current Spring application context, e.g. for bean lookup or
+ * resource loading.
 * 
- * Note that in most cases, one can just declare the same components as Spring beans, through 
- * {@link RegionFactoryBean} which gives access to the full container capabilities and does not enforce the 
- * {@link Declarable} interface to be implemented.
+ * Note that in most cases, one can just declare the same components as Spring
+ * beans, through {@link RegionFactoryBean} which gives access to the full
+ * container capabilities and does not enforce the {@link Declarable} interface
+ * to be implemented.
 * 
 * @author Costin Leau
 */
 public abstract class DeclarableSupport implements CacheCallback, Declarable {

 	private String factoryKey = null;
+
 	private BeanFactoryReference bfReference = null;

 	public DeclarableSupport() {
@@ -48,8 +51,9 @@ public abstract class DeclarableSupport implements CacheCallback, Declarable {
 	 * 
 	 * {@inheritDoc}
 	 * 
-	 * @see #setFactoryKey(String) 
+	 * @see #setFactoryKey(String)
 	 */
+	@Override
 	public final void init(Properties props) {
 		bfReference = new GemfireBeanFactoryLocator().useBeanFactory(factoryKey);
 		initInstance(props);
@@ -67,15 +71,16 @@ public abstract class DeclarableSupport implements CacheCallback, Declarable {
 		return bfReference.getFactory();
 	}

+	@Override
 	public void close() {
 		bfReference.release();
 		bfReference = null;
 	}

 	/**
-	 * Sets the key under which the enclosing beanFactory can be found.
-	 * Needed only if multiple beanFactories are used with GemFire inside
-	 * the same class loader / class space.
+	 * Sets the key under which the enclosing beanFactory can be found. Needed
+	 * only if multiple beanFactories are used with GemFire inside the same
+	 * class loader / class space.
 	 * 
 	 * @see GemfireBeanFactoryLocator
 	 * @param key
--- a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireCallback.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireTransactionCommitException.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireTransactionCommitException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -33,22 +33,26 @@ import com.gemstone.gemfire.cache.CacheTransactionManager;
 import com.gemstone.gemfire.cache.Region;

 /**
- * Local transaction manager for GemFire Enterprise Fabric (GEF). Provides a {@link PlatformTransactionManager}
- * implementation for a single GemFire {@link CacheTransactionManager}.
+ * Local transaction manager for GemFire Enterprise Fabric (GEF). Provides a
+ * {@link PlatformTransactionManager} implementation for a single GemFire
+ * {@link CacheTransactionManager}.
 * 
- * Binds one or multiple GemFire regions for the specified {@link Cache} to the thread, potentially allowing for one
- * region per cache model.
+ * Binds one or multiple GemFire regions for the specified {@link Cache} to the
+ * thread, potentially allowing for one region per cache model.
 * 
 * <p>
- * This local strategy is an alternative to executing cache operations within JTA transactions. Its advantage is that
- * is able to work in any environment, for example a stand-alone application or a test suite. It is <i>not</i> able to
- * provide XA transactions, for example to share transactions with data access.
+ * This local strategy is an alternative to executing cache operations within
+ * JTA transactions. Its advantage is that is able to work in any environment,
+ * for example a stand-alone application or a test suite. It is <i>not</i> able
+ * to provide XA transactions, for example to share transactions with data
+ * access.
 * 
 * <p>
- * To prevent dirty reads, by default, the cache is configured to return copies rather then direct references for
- * <code>get</code> operations. As a workaround, one could use explicitly deep copy objects before making changes
+ * To prevent dirty reads, by default, the cache is configured to return copies
+ * rather then direct references for <code>get</code> operations. As a
+ * workaround, one could use explicitly deep copy objects before making changes
 * to them to avoid unnecessary copying on every fetch.
- *
+ * 
 * @see com.gemstone.gemfire.cache.CacheTransactionManager
 * @see com.gemstone.gemfire.cache.Cache#setCopyOnRead(boolean)
 * @see com.gemstone.gemfire.cache.Region#get(Object)
@@ -58,11 +62,13 @@ import com.gemstone.gemfire.cache.Region;
 * 
 * @author Costin Leau
 */
-// TODO add lenient behavior if a transaction is already started on the current thread (what should happen then)
+// TODO add lenient behavior if a transaction is already started on the current
+// thread (what should happen then)
 public class GemfireTransactionManager extends AbstractPlatformTransactionManager implements InitializingBean,
 		ResourceTransactionManager {

 	private Cache cache;
+
 	private boolean copyOnRead = true;

 	/**
@@ -81,6 +87,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 		afterPropertiesSet();
 	}

+	@Override
 	public void afterPropertiesSet() {
 		Assert.notNull(cache, "Cache property is required");
 		cache.setCopyOnRead(copyOnRead);
@@ -94,6 +101,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 		return txObject;
 	}

+	@Override
 	protected boolean isExistingTransaction(Object transaction) throws TransactionException {
 		CacheTransactionObject txObject = (CacheTransactionObject) transaction;
 		// Consider a pre-bound cache as transaction.
@@ -126,29 +134,34 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage

 	@Override
 	protected void doCommit(DefaultTransactionStatus status) throws TransactionException {
-		//CacheTransactionObject txObject = (CacheTransactionObject) status.getTransaction();
+		// CacheTransactionObject txObject = (CacheTransactionObject)
+		// status.getTransaction();
 		if (status.isDebug()) {
 			logger.debug("Committing Gemfire local transaction on Cache [" + cache + "]");
 		}
 		try {
 			cache.getCacheTransactionManager().commit();
-		} catch (IllegalStateException ex) {
+		}
+		catch (IllegalStateException ex) {
 			throw new NoTransactionException(
 					"No transaction associated with the current thread; are there multiple transaction managers ?", ex);
-		} catch (TransactionException ex) {
+		}
+		catch (TransactionException ex) {
 			throw new GemfireTransactionCommitException("Unexpected failure on commit of Cache local transaction", ex);
 		}
 	}

 	@Override
 	protected void doRollback(DefaultTransactionStatus status) throws TransactionException {
-		//CacheTransactionObject txObject = (CacheTransactionObject) status.getTransaction();
+		// CacheTransactionObject txObject = (CacheTransactionObject)
+		// status.getTransaction();
 		if (status.isDebug()) {
 			logger.debug("Rolling back Cache local transaction for [" + cache + "]");
 		}
 		try {
 			cache.getCacheTransactionManager().rollback();
-		} catch (IllegalStateException ex) {
+		}
+		catch (IllegalStateException ex) {
 			throw new NoTransactionException(
 					"No transaction associated with the current thread; are there multiple transaction managers ?", ex);
 		}
@@ -163,6 +176,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 		txObject.getHolder().setRollbackOnly();
 	}

+	@Override
 	protected void doCleanupAfterCompletion(Object transaction) {
 		// Remove the cache holder from the thread.
 		TransactionSynchronizationManager.unbindResource(cache);
@@ -183,7 +197,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 	}

 	/**
-	 * Sets the Cache that this instance manages local transactions for. 
+	 * Sets the Cache that this instance manages local transactions for.
 	 * 
 	 * @param cache Gemfire cache
 	 */
@@ -191,12 +205,14 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 		this.cache = cache;
 	}

+	@Override
 	public Object getResourceFactory() {
 		return getCache();
 	}

 	/**
-	 * Sets the Gemfire {@link Region} (as an alternative in setting in the cache directly).
+	 * Sets the Gemfire {@link Region} (as an alternative in setting in the
+	 * cache directly).
 	 * 
 	 * @param region Gemfire region
 	 */
@@ -206,22 +222,24 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 	}

 	/**
-	 * Indicates whether the cache returns direct references or copies of the objects (default) it manages.
-	 * While copies imply additional work for every fetch operation, direct references can cause dirty reads
-	 * across concurrent threads in the same VM, whether or not transactions are used.
-	 * <p/> 
-	 * One could explicitly deep copy objects before making changes (for example by using {@link com.gemstone.gemfire.CopyHelper#copy(Object)}
-	 * in which case this setting can be set to <code>false</code>. However, unless there is a measurable 
-	 * performance penalty, the recommendation is to keep this setting to <code>true</code>   
-	 *  
-	 * @param copyOnRead whether copies (default) rather then direct references will be returned on 
-	 * fetch operations
+	 * Indicates whether the cache returns direct references or copies of the
+	 * objects (default) it manages. While copies imply additional work for
+	 * every fetch operation, direct references can cause dirty reads across
+	 * concurrent threads in the same VM, whether or not transactions are used.
+	 * <p/>
+	 * One could explicitly deep copy objects before making changes (for example
+	 * by using {@link com.gemstone.gemfire.CopyHelper#copy(Object)} in which
+	 * case this setting can be set to <code>false</code>. However, unless there
+	 * is a measurable performance penalty, the recommendation is to keep this
+	 * setting to <code>true</code>
+	 * 
+	 * @param copyOnRead whether copies (default) rather then direct references
+	 * will be returned on fetch operations
 	 */
 	public void setCopyOnRead(boolean copyOnRead) {
 		this.copyOnRead = copyOnRead;
 	}

-
 	/**
 	 * Indicates whether copy on read is set or not on the transaction manager.
 	 * 
@@ -232,7 +250,6 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage
 		return copyOnRead;
 	}

-
 	/**
 	 * GemfireTM local transaction object.
 	 * 
@@ -254,7 +271,6 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage

 		private boolean rollbackOnly = false;

-
 		public boolean isRollbackOnly() {
 			return rollbackOnly;
 		}
--- a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
@@ -143,9 +143,10 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 			regionFactory.setDiskStoreName(diskStoreName);
 		}

-		Assert.state(!attributes.isLockGrantor() || scope.isGlobal(),
-				"Lock grantor only applies to a global scoped region");
-
+		if (attributes != null) {
+			Assert.state(!attributes.isLockGrantor() || scope.isGlobal(),
+					"Lock grantor only applies to a global scoped region");
+		}
 		// get underlying AttributesFactory
 		postProcess(findAttrFactory(regionFactory));

@@ -155,7 +156,7 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 			reg.loadSnapshot(snapshot.getInputStream());
 		}

-		if (attributes.isLockGrantor()) {
+		if (attributes != null && attributes.isLockGrantor()) {
 			reg.becomeLockGrantor();
 		}

--- a/src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java
+++ b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/client/Interest.java
+++ b/src/main/java/org/springframework/data/gemfire/client/Interest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/client/PoolConnection.java
+++ b/src/main/java/org/springframework/data/gemfire/client/PoolConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java
+++ b/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/CacheParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/CacheParser.java
@@ -16,13 +16,18 @@

 package org.springframework.data.gemfire.config;

+import java.util.List;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.CacheFactoryBean;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

 /**
@@ -30,8 +35,9 @@ import org.w3c.dom.Element;
 * 
 * @author Costin Leau
 * @author Oliver Gierke
+ * @author David Turanski
 */
-class CacheParser extends AbstractSingleBeanDefinitionParser {
+class CacheParser extends AbstractSimpleBeanDefinitionParser {

 	@Override
 	protected Class<?> getBeanClass(Element element) {
@@ -39,7 +45,7 @@ class CacheParser extends AbstractSingleBeanDefinitionParser {
 	}

 	@Override
-	protected void doParse(Element element, BeanDefinitionBuilder builder) {
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 		super.doParse(element, builder);

 		ParsingUtils.setPropertyValue(element, builder, "cache-xml-location", "cacheXml");
@@ -55,6 +61,26 @@ class CacheParser extends AbstractSingleBeanDefinitionParser {
 		ParsingUtils.setPropertyValue(element, builder, "lock-lease", "lockLease");
 		ParsingUtils.setPropertyValue(element, builder, "message-sync-interval", "messageSyncInterval");
 		ParsingUtils.setPropertyValue(element, builder, "search-timeout", "searchTimeout");
+		List<Element> txListeners = DomUtils.getChildElementsByTagName(element, "transaction-listener");
+		if (!CollectionUtils.isEmpty(txListeners)) {
+			ManagedList<Object> transactionListeners = new ManagedList<Object>();
+			for (Element txListener : txListeners) {
+				transactionListeners.add(ParsingUtils.parseRefOrNestedBeanDeclaration(parserContext, txListener,
+						builder));
+			}
+			builder.addPropertyValue("transactionListeners", transactionListeners);
+		}
+		Element txWriter = DomUtils.getChildElementByTagName(element, "transaction-writer");
+		if (txWriter != null) {
+			builder.addPropertyValue("transactionWriter",
+					ParsingUtils.parseRefOrNestedBeanDeclaration(parserContext, txWriter, builder));
+		}
+
+		Element initializer = DomUtils.getChildElementByTagName(element, "initializer");
+		if (initializer != null) {
+			builder.addPropertyValue("initializer",
+					ParsingUtils.parseRefOrNestedBeanDeclaration(parserContext, initializer, builder));
+		}
 	}

 	@Override
@@ -66,4 +92,5 @@ class CacheParser extends AbstractSingleBeanDefinitionParser {
 		}
 		return name;
 	}
+
 }
--- a/src/main/java/org/springframework/data/gemfire/config/CacheServerParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/CacheServerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/ClientCacheParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ClientCacheParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.data.gemfire.config;

 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
 import org.w3c.dom.Element;

@@ -33,8 +34,8 @@ class ClientCacheParser extends CacheParser {
 	}

 	@Override
-	protected void doParse(Element element, BeanDefinitionBuilder builder) {
-		super.doParse(element, builder);
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+		super.doParse(element, parserContext, builder);

 		ParsingUtils.setPropertyValue(element, builder, "pool-name", "poolName");
 	}
--- a/src/main/java/org/springframework/data/gemfire/config/DiskStoreParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/DiskStoreParser.java
@@ -29,6 +29,7 @@ import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

 /**
+ * Parser for the &lt;disk-store&gt; definitions.
 * @author David Turanski
 * 
 */
--- a/src/main/java/org/springframework/data/gemfire/config/DiskWriteAttributesFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/config/DiskWriteAttributesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/EvictionAttributesFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/config/EvictionAttributesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/EvictionType.java
+++ b/src/main/java/org/springframework/data/gemfire/config/EvictionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/GemfireListenerContainerParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/GemfireListenerContainerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java
+++ b/src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/IndexParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/IndexParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java
@@ -236,6 +236,8 @@ abstract class ParsingUtils {
 		setPropertyValue(element, attrBuilder, "initial-capacity");
 		setPropertyValue(element, attrBuilder, "load-factor");
 		setPropertyValue(element, attrBuilder, "cloning-enabled");
+		setPropertyValue(element, attrBuilder, "concurrency-level");
+		setPropertyValue(element, attrBuilder, "multicast-enabled");

 		String indexUpdateType = element.getAttribute("index-update-type");
 		if (StringUtils.hasText(indexUpdateType)) {
--- a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
@@ -65,8 +65,6 @@ class PartitionedRegionParser extends AbstractRegionParser {
 			builder.addPropertyValue("dataPolicy", DataPolicy.PARTITION);
 		}

-		ParsingUtils.parseScope(element, builder);
-
 		BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
 				.genericBeanDefinition(RegionAttributesFactoryBean.class);

--- a/src/main/java/org/springframework/data/gemfire/config/PoolParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/PoolParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/config/TransactionManagerParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/TransactionManagerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import org.w3c.dom.Element;
 */
 class TransactionManagerParser extends AbstractSingleBeanDefinitionParser {

+	@Override
 	protected Class<?> getBeanClass(Element element) {
 		return GemfireTransactionManager.class;
 	}
--- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/listener/GemfireListenerExecutionFailedException.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/GemfireListenerExecutionFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ * Copyright 2011-2012-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java
+++ b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java
+++ b/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java
+++ b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java
+++ b/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java
+++ b/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java
+++ b/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java
+++ b/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/src/main/java/org/springframework/data/gemfire/support/GemfireDaoSupport.java
+++ b/src/main/java/org/springframework/data/gemfire/support/GemfireDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.