Merge branch 'master' into client-cache

Conflicts:
	src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java

src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.
@@ -61,4 +61,5 @@ public class CacheIntegrationTest extends RecreatingContextTest{
 	public void testCacheWithXml() throws Exception {
 		Cache cache = ctx.getBean("cache-with-xml", Cache.class);
 	}
-}
+
+}

src/test/java/org/springframework/data/gemfire/DeclarableSupportTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/GemfireBeanFactoryLocatorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/TestUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/UserObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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,12 +17,14 @@
 package org.springframework.data.gemfire.config;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.springframework.core.io.Resource;
 import org.springframework.data.gemfire.CacheFactoryBean;
+import org.springframework.data.gemfire.GemfireBeanFactoryLocator;
 import org.springframework.data.gemfire.RecreatingContextTest;
 import org.springframework.data.gemfire.TestUtils;
 
@@ -61,4 +63,17 @@ public class CacheNamespaceTest extends RecreatingContextTest {
 		assertEquals(ctx.getBean("props"), TestUtils.readField("properties", cfb));
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void testNoBeanFactory() throws Exception {
+		assertTrue(ctx.containsBean("no-bl"));
+		CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&no-bl");
+		GemfireBeanFactoryLocator locator = new GemfireBeanFactoryLocator();
+		try {
+			assertNotNull(locator.useBeanFactory("cache-with-name"));
+			locator.useBeanFactory("no-bl");
+		} finally {
+			locator.destroy();
+		}
+	}
+
 }

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011 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.
+ * 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.
+ */
+
+package org.springframework.data.gemfire.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.springframework.data.gemfire.RecreatingContextTest;
+
+import com.gemstone.gemfire.cache.server.CacheServer;
+
+/**
+ * 
+ * @author Costin Leau
+ */
+public class CacheServerNamespaceTest extends RecreatingContextTest {
+
+	@Override
+	protected String location() {
+		return "org/springframework/data/gemfire/config/server-ns.xml";
+	}
+
+	@Test
+	public void testBasicCacheServer() throws Exception {
+		CacheServer cacheServer = ctx.getBean("advanced-config", CacheServer.class);
+		assertTrue(cacheServer.isRunning());
+		assertEquals(1, cacheServer.getGroups().length);
+		assertEquals("test-server", cacheServer.getGroups()[0]);
+		assertEquals(22, cacheServer.getMaxConnections());
+
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.
@@ -61,6 +61,8 @@ public class PartitionedRegionNamespaceTest {
 		assertEquals("redundant", TestUtils.readField("name", fb));
 
 		RegionAttributes attrs = TestUtils.readField("attributes", fb);
+		assertTrue(attrs.getStatisticsEnabled());
+
 		PartitionAttributes pAttr = attrs.getPartitionAttributes();
 
 		assertEquals(1, pAttr.getRedundantCopies());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * Copyright 2010-2011 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.

src/test/java/org/springframework/data/gemfire/support/GemfireDaoSupportTests.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2011 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.
+ * 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.
+ */
+package org.springframework.data.gemfire.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.springframework.data.gemfire.GemfireTemplate;
+
+/**
+ * @author Costin Leau
+ * 
+ */
+public class GemfireDaoSupportTests extends TestCase {
+
+	public void testGemfireDaoSupportWithTemplate() throws Exception {
+		GemfireTemplate template = new GemfireTemplate();
+		final List test = new ArrayList();
+		GemfireDaoSupport dao = new GemfireDaoSupport() {
+			protected void initDao() {
+				test.add("test");
+			}
+		};
+		dao.setGemfireTemplate(template);
+		dao.afterPropertiesSet();
+		assertNotNull("template not created", dao.getGemfireTemplate());
+		assertEquals("incorrect template", template, dao.getGemfireTemplate());
+		assertEquals("initDao not called", test.size(), 1);
+	}
+
+	public void testInvalidDaoTemplate() throws Exception {
+		GemfireDaoSupport dao = new GemfireDaoSupport() {
+		};
+		try {
+			dao.afterPropertiesSet();
+			fail("expected exception");
+		} catch (IllegalArgumentException iae) {
+			// okay
+		}
+	}
+}

src/test/resources/org/springframework/data/gemfire/basic-cache.xml

@@ -35,5 +35,8 @@
 	<bean id="cache-with-xml" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="cacheXml" value="classpath:cache.xml"/>
 	</bean>
+
+	<bean id="pdx-cache" class="org.springframework.data.gemfire.CacheFactoryBean">
+	</bean>
 	
 </beans>

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

@@ -21,4 +21,6 @@
 	<util:properties id="props">
 		<prop key="disable-tcp">false</prop>
 	</util:properties>
+	
+	<gfe:cache id="no-bl" use-bean-factory-locator="false" />
 </beans>

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

@@ -12,7 +12,7 @@
 	
 	<gfe:partitioned-region id="simple" />
 	
-	<gfe:partitioned-region id="options" copies="1" total-buckets="4" name="redundant" close="true" destroy="false">
+	<gfe:partitioned-region id="options" copies="1" total-buckets="4" name="redundant" close="true" destroy="false" statistics="true">
 		<gfe:partition-resolver>
 			<bean class="org.springframework.data.gemfire.SimplePartitionResolver"/>
 		</gfe:partition-resolver>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	default-lazy-init="true"
+	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	<gfe:cache />
+	
+	<!-- Advanced example depicting various cache server configuration options -->
+	<gfe:cache-server id="advanced-config" auto-startup="true"
+		bind-address="localhost" port="${gfe.port.6}" host-name-for-clients="localhost"
+		load-poll-interval="2000" max-connections="22" max-threads="16"
+		max-message-count="1000" max-time-between-pings="30000"
+		groups="test-server">
+
+		<gfe:subscription-config eviction-type="ENTRY" capacity="1000" disk-store="file://${java.io.tmpdir}"/>
+	</gfe:cache-server>
+
+	<context:property-placeholder location="classpath:port.properties" />
+
+	
+</beans>

src/test/resources/port.properties

@@ -1,2 +1,3 @@
 gfe.port=40403
-gfe.port.4=40404
+gfe.port.4=40404
+gfe.port.6=40406