This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 3450bac GEODE-8836: Fix incorrect schema location for cli tests (#721)
3450bac is described below
commit 3450baca23d07259725c8ed3832d5ef6b781f1c5
Author: Michael Martell <[email protected]>
AuthorDate: Fri Jan 29 10:31:50 2021 -0800
GEODE-8836: Fix incorrect schema location for cli tests (#721)
---
clicache/acceptance-test/cache.xml | 2 +-
clicache/integration-test/cache.xml | 2 +-
clicache/integration-test/cache_redundancy.xml | 2 +-
clicache/integration-test/client_Loader.xml | 2 +-
clicache/integration-test/client_generics_plugins.xml | 2 +-
clicache/integration-test/client_pdx.xml | 2 +-
clicache/integration-test/client_pool.xml | 2 +-
clicache/integration-test/invalid_cache1.xml | 2 +-
clicache/integration-test/invalid_cache2.xml | 2 +-
clicache/integration-test/invalid_cache3.xml | 2 +-
clicache/integration-test/invalid_cache_pool.xml | 2 +-
clicache/integration-test/invalid_cache_pool2.xml | 2 +-
clicache/integration-test/invalid_cache_pool3.xml | 2 +-
clicache/integration-test/invalid_cache_pool4.xml | 2 +-
clicache/integration-test/invalid_overflowAttr1.xml | 2 +-
clicache/integration-test/invalid_overflowAttr2.xml | 2 +-
clicache/integration-test/invalid_overflowAttr3.xml | 2 +-
clicache/integration-test/valid_cache.xml | 2 +-
clicache/integration-test/valid_cache_refid.xml | 2 +-
clicache/integration-test/valid_cache_region_refid.xml | 2 +-
clicache/integration-test/valid_declarative_cache_creation.xml | 2 +-
clicache/integration-test/valid_lruExpiration.xml | 2 +-
clicache/integration-test/valid_overflowAttr.xml | 2 +-
clicache/integration-test2/cache.xml | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/clicache/acceptance-test/cache.xml
b/clicache/acceptance-test/cache.xml
index 9840108..c205f3d 100644
--- a/clicache/acceptance-test/cache.xml
+++ b/clicache/acceptance-test/cache.xml
@@ -19,7 +19,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<pool name="default">
diff --git a/clicache/integration-test/cache.xml
b/clicache/integration-test/cache.xml
index d5f17bf..133e380 100644
--- a/clicache/integration-test/cache.xml
+++ b/clicache/integration-test/cache.xml
@@ -21,7 +21,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
</client-cache>
diff --git a/clicache/integration-test/cache_redundancy.xml
b/clicache/integration-test/cache_redundancy.xml
index 5eafda4..d8a1efe 100644
--- a/clicache/integration-test/cache_redundancy.xml
+++ b/clicache/integration-test/cache_redundancy.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0"
redundancy-level="1"
endpoints="localhost:HOST_PORT1,localhost:HOST_PORT2" >
diff --git a/clicache/integration-test/client_Loader.xml
b/clicache/integration-test/client_Loader.xml
index 53a17cf..04e157e 100644
--- a/clicache/integration-test/client_Loader.xml
+++ b/clicache/integration-test/client_Loader.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<region name = "root" >
diff --git a/clicache/integration-test/client_generics_plugins.xml
b/clicache/integration-test/client_generics_plugins.xml
index 89a7439..6f1fb8c 100644
--- a/clicache/integration-test/client_generics_plugins.xml
+++ b/clicache/integration-test/client_generics_plugins.xml
@@ -21,7 +21,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0"
redundancy-level="1" >
diff --git a/clicache/integration-test/client_pdx.xml
b/clicache/integration-test/client_pdx.xml
index a72a8e6..ba12647 100644
--- a/clicache/integration-test/client_pdx.xml
+++ b/clicache/integration-test/client_pdx.xml
@@ -22,7 +22,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0"
>
diff --git a/clicache/integration-test/client_pool.xml
b/clicache/integration-test/client_pool.xml
index 7fc5ea4..655b471 100644
--- a/clicache/integration-test/client_pool.xml
+++ b/clicache/integration-test/client_pool.xml
@@ -22,7 +22,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0"
redundancy-level="1" >
diff --git a/clicache/integration-test/invalid_cache1.xml
b/clicache/integration-test/invalid_cache1.xml
index 91c1e23..dacf0b1 100644
--- a/clicache/integration-test/invalid_cache1.xml
+++ b/clicache/integration-test/invalid_cache1.xml
@@ -24,7 +24,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<region>
diff --git a/clicache/integration-test/invalid_cache2.xml
b/clicache/integration-test/invalid_cache2.xml
index 619dea7..ee2e05b 100644
--- a/clicache/integration-test/invalid_cache2.xml
+++ b/clicache/integration-test/invalid_cache2.xml
@@ -24,7 +24,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "root1" >
<region-attributes scope="local" caching-enabled="true" lru-entries-limit
= "35">
diff --git a/clicache/integration-test/invalid_cache3.xml
b/clicache/integration-test/invalid_cache3.xml
index 75b0b84..ec86565 100644
--- a/clicache/integration-test/invalid_cache3.xml
+++ b/clicache/integration-test/invalid_cache3.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "root1" >
diff --git a/clicache/integration-test/invalid_cache_pool.xml
b/clicache/integration-test/invalid_cache_pool.xml
index 0a58942..3f38628 100644
--- a/clicache/integration-test/invalid_cache_pool.xml
+++ b/clicache/integration-test/invalid_cache_pool.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
diff --git a/clicache/integration-test/invalid_cache_pool2.xml
b/clicache/integration-test/invalid_cache_pool2.xml
index 32c92de..6aaf484 100644
--- a/clicache/integration-test/invalid_cache_pool2.xml
+++ b/clicache/integration-test/invalid_cache_pool2.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
diff --git a/clicache/integration-test/invalid_cache_pool3.xml
b/clicache/integration-test/invalid_cache_pool3.xml
index 73fcc6f..dbe1d3b 100644
--- a/clicache/integration-test/invalid_cache_pool3.xml
+++ b/clicache/integration-test/invalid_cache_pool3.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0"
endpoints="must_fail_with_pool:12345">
diff --git a/clicache/integration-test/invalid_cache_pool4.xml
b/clicache/integration-test/invalid_cache_pool4.xml
index 0d7c81a..c2a4496 100644
--- a/clicache/integration-test/invalid_cache_pool4.xml
+++ b/clicache/integration-test/invalid_cache_pool4.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
diff --git a/clicache/integration-test/invalid_overflowAttr1.xml
b/clicache/integration-test/invalid_overflowAttr1.xml
index 1f0f2b6..9651420 100644
--- a/clicache/integration-test/invalid_overflowAttr1.xml
+++ b/clicache/integration-test/invalid_overflowAttr1.xml
@@ -24,7 +24,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
<region-attributes scope="local" caching-enabled="true"
initial-capacity="25" load-factor="0.32" concurrency-level="10"
lru-entries-limit = "35" disk-policy="overflows">
diff --git a/clicache/integration-test/invalid_overflowAttr2.xml
b/clicache/integration-test/invalid_overflowAttr2.xml
index 93343ae..1e78f91 100644
--- a/clicache/integration-test/invalid_overflowAttr2.xml
+++ b/clicache/integration-test/invalid_overflowAttr2.xml
@@ -24,7 +24,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "root1" >
<region-attributes scope="local" caching-enabled="true" lru-entries-limit
= "35" disk-policy="overflows">
diff --git a/clicache/integration-test/invalid_overflowAttr3.xml
b/clicache/integration-test/invalid_overflowAttr3.xml
index 5b024f4..894e605 100644
--- a/clicache/integration-test/invalid_overflowAttr3.xml
+++ b/clicache/integration-test/invalid_overflowAttr3.xml
@@ -24,7 +24,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "root1" >
<region-attributes scope="local" caching-enabled="true"
initial-capacity="25" load-factor="0.32" concurrency-level="10"
lru-entries-limit = "35" disk-policy="overflows">
diff --git a/clicache/integration-test/valid_cache.xml
b/clicache/integration-test/valid_cache.xml
index 881072f..84c2ba9 100644
--- a/clicache/integration-test/valid_cache.xml
+++ b/clicache/integration-test/valid_cache.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
diff --git a/clicache/integration-test/valid_cache_refid.xml
b/clicache/integration-test/valid_cache_refid.xml
index 088234a..d632025 100644
--- a/clicache/integration-test/valid_cache_refid.xml
+++ b/clicache/integration-test/valid_cache_refid.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
diff --git a/clicache/integration-test/valid_cache_region_refid.xml
b/clicache/integration-test/valid_cache_region_refid.xml
index c312b22..45ce6b4 100644
--- a/clicache/integration-test/valid_cache_region_refid.xml
+++ b/clicache/integration-test/valid_cache_region_refid.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
diff --git a/clicache/integration-test/valid_declarative_cache_creation.xml
b/clicache/integration-test/valid_declarative_cache_creation.xml
index d90ba22..8a0c028 100644
--- a/clicache/integration-test/valid_declarative_cache_creation.xml
+++ b/clicache/integration-test/valid_declarative_cache_creation.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<!-- xml with region-attribute having only child elements no attributes. refer
to Ticket #775 -->
<root-region name= "Root1">
diff --git a/clicache/integration-test/valid_lruExpiration.xml
b/clicache/integration-test/valid_lruExpiration.xml
index 81aec12..6df0672 100644
--- a/clicache/integration-test/valid_lruExpiration.xml
+++ b/clicache/integration-test/valid_lruExpiration.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "R1" >
diff --git a/clicache/integration-test/valid_overflowAttr.xml
b/clicache/integration-test/valid_overflowAttr.xml
index 446d243..b0466ec 100644
--- a/clicache/integration-test/valid_overflowAttr.xml
+++ b/clicache/integration-test/valid_overflowAttr.xml
@@ -23,7 +23,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<root-region name = "Root1" >
diff --git a/clicache/integration-test2/cache.xml
b/clicache/integration-test2/cache.xml
index 9840108..c205f3d 100644
--- a/clicache/integration-test2/cache.xml
+++ b/clicache/integration-test2/cache.xml
@@ -19,7 +19,7 @@
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/cpp-cache-1.0.xsd";
+
http://geode.apache.org/schema/cpp-cache/cpp-cache-1.0.xsd";
version="9.0">
<pool name="default">
