This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 70eed16a9abccf78aa5d991be932ee6e34f232c0
Author: Michael Oleske <mole...@pivotal.io>
AuthorDate: Tue Feb 20 14:38:10 2018 -0800
GEODE-4697: Removing FunctionExecutionTimeout from cppcache in addition
to clicache
---
.../resources/func_cacheserver1_pool.xml | 144 ++++++++++-----------
.../resources/func_cacheserver2_pool.xml | 143 ++++++++++----------
.../resources/func_cacheserver3_pool.xml | 128 +++++++++---------
3 files changed, 195 insertions(+), 220 deletions(-)
diff --git a/cppcache/integration-test/resources/func_cacheserver1_pool.xml
b/cppcache/integration-test/resources/func_cacheserver1_pool.xml
index 98d8b4a..34d6e0e 100755
--- a/cppcache/integration-test/resources/func_cacheserver1_pool.xml
+++ b/cppcache/integration-test/resources/func_cacheserver1_pool.xml
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,81 +15,74 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
-<cache xmlns="http://geode.apache.org/schema/cache";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://geode.apache.org/schema/cache
http://geode.apache.org/schema/cache/cache-1.0.xsd";
- version="1.0">
- <cache-server port="HOST_PORT1">
- <group>ServerGroup1</group>
+<cache
+ xmlns="http://geode.apache.org/schema/cache";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://geode.apache.org/schema/cache
http://geode.apache.org/schema/cache/cache-1.0.xsd"; version="1.0">
+ <cache-server port="HOST_PORT1">
+ <group>ServerGroup1</group>
</cache-server>
- <pdx read-serialized="true" />
- <region name='partition_region'>
- <region-attributes data-policy="partition" >
- <partition-attributes redundant-copies="1"
startup-recovery-delay="1"/>
+ <pdx read-serialized="true" />
+ <region name='partition_region'>
+ <region-attributes data-policy="partition">
+ <partition-attributes redundant-copies="1"
startup-recovery-delay="1"/>
</region-attributes>
</region>
- <function-service>
- <function>
- <class-name>javaobject.MultiGetFunctionI</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiPutFunctionI</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiGetFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiGetFunction2</class-name>
- </function>
- <function>
-
<class-name>javaobject.ThinClientRegionExceptionTest</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiPutFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsHAFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.ExceptionHandlingFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.OnServerHAExceptionFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.OnServerHAShutdownFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.PdxFunctionTest</class-name>
- </function>
- <function>
- <class-name>javaobject.SingleStrGetFunction</class-name>
- </function>
- <function>
-
<class-name>javaobject.executeFunction_SendException</class-name>
- </function>
- <function>
- <class-name>javaobject.FEOnRegionPrSHOP</class-name>
- </function>
- <function>
- <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name>
- </function>
- <function>
- <class-name>javaobject.FunctionExecutionTimeOut</class-name>
- </function>
- </function-service>
- <serialization-registration>
- <instantiator id="5200" >
- <class-name>javaobject.InstantiatorTest</class-name>
- </instantiator>
- </serialization-registration>
-</cache>
+ <function-service>
+ <function>
+ <class-name>javaobject.MultiGetFunctionI</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiPutFunctionI</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiGetFunction</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiGetFunction2</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.ThinClientRegionExceptionTest</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiPutFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsHAFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.ExceptionHandlingFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.OnServerHAExceptionFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.OnServerHAShutdownFunction</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.PdxFunctionTest</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.SingleStrGetFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.executeFunction_SendException</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.FEOnRegionPrSHOP</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name>
+ </function>
+ </function-service>
+ <serialization-registration>
+ <instantiator id="5200">
+ <class-name>javaobject.InstantiatorTest</class-name>
+ </instantiator>
+ </serialization-registration>
+</cache>
\ No newline at end of file
diff --git a/cppcache/integration-test/resources/func_cacheserver2_pool.xml
b/cppcache/integration-test/resources/func_cacheserver2_pool.xml
index 9b90099..fb1e791 100755
--- a/cppcache/integration-test/resources/func_cacheserver2_pool.xml
+++ b/cppcache/integration-test/resources/func_cacheserver2_pool.xml
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,82 +15,74 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
-<cache xmlns="http://geode.apache.org/schema/cache";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://geode.apache.org/schema/cache
http://geode.apache.org/schema/cache/cache-1.0.xsd";
- version="1.0">
- <cache-server port="HOST_PORT2">
- <group>ServerGroup1</group>
+<cache
+ xmlns="http://geode.apache.org/schema/cache";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://geode.apache.org/schema/cache
http://geode.apache.org/schema/cache/cache-1.0.xsd"; version="1.0">
+ <cache-server port="HOST_PORT2">
+ <group>ServerGroup1</group>
</cache-server>
- <pdx read-serialized="true" />
+ <pdx read-serialized="true" />
<region name='partition_region'>
- <region-attributes data-policy="partition" >
- <partition-attributes redundant-copies="1"
startup-recovery-delay="1"/>
+ <region-attributes data-policy="partition">
+ <partition-attributes redundant-copies="1"
startup-recovery-delay="1"/>
</region-attributes>
</region>
- <function-service>
- <function>
- <class-name>javaobject.MultiGetFunctionI</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiPutFunctionI</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiGetFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiGetFunction2</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiPutFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsHAFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.ExceptionHandlingFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.OnServerHAExceptionFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.OnServerHAShutdownFunction</class-name>
- </function>
-
- <function>
- <class-name>javaobject.SingleStrGetFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.executeFunction_SendException</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name>
- </function>
- <function>
- <class-name>javaobject.PdxFunctionTest</class-name>
- </function>
- <function>
- <class-name>javaobject.FEOnRegionPrSHOP</class-name>
- </function>
- <function>
- <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name>
- </function>
- <function>
- <class-name>javaobject.FunctionExecutionTimeOut</class-name>
- </function>
- <function>
- <class-name>javaobject.ThinClientRegionExceptionTest</class-name>
- </function>
- </function-service>
- <serialization-registration>
- <instantiator id="5200" >
- <class-name>javaobject.InstantiatorTest</class-name>
- </instantiator>
- </serialization-registration>
-</cache>
+ <function-service>
+ <function>
+ <class-name>javaobject.MultiGetFunctionI</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiPutFunctionI</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiGetFunction</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiGetFunction2</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiPutFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsHAFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.ExceptionHandlingFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.OnServerHAExceptionFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.OnServerHAShutdownFunction</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.SingleStrGetFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.executeFunction_SendException</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.PdxFunctionTest</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.FEOnRegionPrSHOP</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.ThinClientRegionExceptionTest</class-name>
+ </function>
+ </function-service>
+ <serialization-registration>
+ <instantiator id="5200">
+ <class-name>javaobject.InstantiatorTest</class-name>
+ </instantiator>
+ </serialization-registration>
+</cache>
\ No newline at end of file
diff --git a/cppcache/integration-test/resources/func_cacheserver3_pool.xml
b/cppcache/integration-test/resources/func_cacheserver3_pool.xml
index 39224b9..0383bdb 100755
--- a/cppcache/integration-test/resources/func_cacheserver3_pool.xml
+++ b/cppcache/integration-test/resources/func_cacheserver3_pool.xml
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,74 +15,67 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
-<cache xmlns="http://geode.apache.org/schema/cache";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://geode.apache.org/schema/cache
http://geode.apache.org/schema/cache/cache-1.0.xsd";
- version="1.0">
- <cache-server port="HOST_PORT3">
- <group>ServerGroup1</group>
+<cache
+ xmlns="http://geode.apache.org/schema/cache";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://geode.apache.org/schema/cache
http://geode.apache.org/schema/cache/cache-1.0.xsd"; version="1.0">
+ <cache-server port="HOST_PORT3">
+ <group>ServerGroup1</group>
</cache-server>
<region name='partition_region'>
- <region-attributes data-policy="partition" >
- <partition-attributes redundant-copies="1"
startup-recovery-delay="1"/>
+ <region-attributes data-policy="partition">
+ <partition-attributes redundant-copies="1"
startup-recovery-delay="1"/>
</region-attributes>
</region>
- <function-service>
- <function>
- <class-name>javaobject.MultiGetFunctionI</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiPutFunctionI</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiGetFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.MultiPutFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsHAFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.ExceptionHandlingFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.OnServerHAExceptionFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.OnServerHAShutdownFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.SingleStrGetFunction</class-name>
- </function>
- <function>
- <class-name>javaobject.executeFunction_SendException</class-name>
- </function>
- <function>
- <class-name>javaobject.FEOnRegionPrSHOP</class-name>
- </function>
- <function>
- <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name>
- </function>
- <function>
- <class-name>javaobject.ThinClientRegionExceptionTest</class-name>
- </function>
- <function>
- <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name>
- </function>
- <function>
- <class-name>javaobject.FunctionExecutionTimeOut</class-name>
- </function>
- </function-service>
- <serialization-registration>
- <instantiator id="5200" >
- <class-name>javaobject.InstantiatorTest</class-name>
- </instantiator>
- </serialization-registration>
-</cache>
+ <function-service>
+ <function>
+ <class-name>javaobject.MultiGetFunctionI</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiPutFunctionI</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiGetFunction</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.MultiPutFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsHAFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.ExceptionHandlingFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.OnServerHAExceptionFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.OnServerHAShutdownFunction</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.SingleStrGetFunction</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.executeFunction_SendException</class-name>
+ </function>
+ <function>
+ <class-name>javaobject.FEOnRegionPrSHOP</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.ThinClientRegionExceptionTest</class-name>
+ </function>
+ <function>
+
<class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name>
+ </function>
+ </function-service>
+ <serialization-registration>
+ <instantiator id="5200">
+ <class-name>javaobject.InstantiatorTest</class-name>
+ </instantiator>
+ </serialization-registration>
+</cache>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
echobr...@apache.org.
