From 8861e89a97450bac669eff14e1c8f9d6eb69197b Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski_at_vmware_dot_com>
Date: Tue, 5 Feb 2013 10:37:33 -0500
Subject: [PATCH] Reinstated FUNCTIONAL as a valid index type XML attribute and
 correction for compiler issue in GemfireOnRegionFunctionTemplate

---
 .../function/execution/GemfireOnRegionFunctionTemplate.java     | 2 +-
 .../springframework/data/gemfire/config/spring-gemfire-1.3.xsd  | 1 +
 .../org/springframework/data/gemfire/config/index-ns.xml        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java
index dc94024b..1afd624f 100644
--- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java
+++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java
@@ -58,7 +58,7 @@ public class GemfireOnRegionFunctionTemplate  extends AbstractFunctionTemplate i
 	
 	@Override
 	public <T> T executeAndextract(String functionId, Set<?> keys, Object... args) {
-		return executeAndExtract(new RegionFunctionExecution(region)
+		return this.<T> executeAndExtract(new RegionFunctionExecution(region)
 				.setKeys(keys)
 				.setFunctionId(functionId)
 				.setTimeout(timeout)
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd
index dddbc818..3c72170e 100755
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd
@@ -2149,6 +2149,7 @@ The name of the index bean definition. If property 'name' is not set, it will be
                     <xsd:restriction base="xsd:string">
                         <xsd:enumeration value="HASH" />
                         <xsd:enumeration value="PRIMARY_KEY"/>
+                        <xsd:enumeration value="FUNCTIONAL"/>
                     </xsd:restriction>
                 </xsd:simpleType>
             </xsd:attribute>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml
index ba873f7a..343a5879 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml
@@ -15,7 +15,7 @@
 	<!-- as there can be only one cache per VM -->
 	
 	
-	<gfe:index id="simple" expression="status" from="/test-index"/>
+	<gfe:index id="simple" expression="status" from="/test-index" type="FUNCTIONAL"/>
 	
 	<gfe:index id="complex" name="complex-index" expression="tsi.name" from="/test-index tsi" type="HASH" imports="import java.util"/>