You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/12 19:43:26 UTC
[36/50] [abbrv] incubator-geode git commit: GEODE-386: Change xsd
namespace to apache
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
new file mode 100644
index 0000000..57e3a13
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
@@ -0,0 +1,234 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.gemstone.gemfire.cache30;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+
+
+public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
+ private static final long serialVersionUID = -6437436147079728413L;
+
+ public CacheXmlGeode10DUnitTest(String name) {
+ super(name);
+ }
+
+
+ // ////// Helper methods
+
+ protected String getGemFireVersion()
+ {
+ return CacheXml.VERSION_1_0;
+ }
+
+ @SuppressWarnings("rawtypes")
+ public void testEnableOffHeapMemory() {
+ try {
+ System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+
+ final String regionName = "testEnableOffHeapMemory";
+
+ final CacheCreation cache = new CacheCreation();
+ final RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
+ attrs.setOffHeap(true);
+ assertEquals(true, attrs.getOffHeap());
+
+ final Region regionBefore = cache.createRegion(regionName, attrs);
+ assertNotNull(regionBefore);
+ assertEquals(true, regionBefore.getAttributes().getOffHeap());
+
+ testXml(cache);
+
+ final Cache c = getCache();
+ assertNotNull(c);
+
+ final Region regionAfter = c.getRegion(regionName);
+ assertNotNull(regionAfter);
+ assertEquals(true, regionAfter.getAttributes().getOffHeap());
+ assertEquals(true, ((LocalRegion)regionAfter).getOffHeap());
+ regionAfter.localDestroyRegion();
+ } finally {
+ System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
+ }
+ }
+
+ @SuppressWarnings("rawtypes")
+ public void testEnableOffHeapMemoryRootRegionWithoutOffHeapMemoryThrowsException() {
+ final String regionName = getUniqueName();
+
+ final CacheCreation cache = new CacheCreation();
+ final RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
+ attrs.setOffHeap(true);
+ assertEquals(true, attrs.getOffHeap());
+
+ final Region regionBefore = cache.createRegion(regionName, attrs);
+ assertNotNull(regionBefore);
+ assertEquals(true, regionBefore.getAttributes().getOffHeap());
+
+ IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.
+ LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName));
+ try {
+ testXml(cache);
+ } catch (IllegalStateException e) {
+ // expected
+ String msg = LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName);
+ assertEquals(msg, e.getMessage());
+ } finally {
+ expectedException.remove();
+ }
+ }
+
+ @SuppressWarnings({ "rawtypes", "deprecation", "unchecked" })
+ public void testEnableOffHeapMemorySubRegionWithoutOffHeapMemoryThrowsException() {
+ final String rootRegionName = getUniqueName();
+ final String subRegionName = "subRegion";
+
+ final CacheCreation cache = new CacheCreation();
+ final RegionAttributesCreation rootRegionAttrs = new RegionAttributesCreation(cache);
+ assertEquals(false, rootRegionAttrs.getOffHeap());
+
+ final Region rootRegionBefore = cache.createRegion(rootRegionName, rootRegionAttrs);
+ assertNotNull(rootRegionBefore);
+ assertEquals(false, rootRegionBefore.getAttributes().getOffHeap());
+
+ final RegionAttributesCreation subRegionAttrs = new RegionAttributesCreation(cache);
+ subRegionAttrs.setOffHeap(true);
+ assertEquals(true, subRegionAttrs.getOffHeap());
+
+ final Region subRegionBefore = rootRegionBefore.createSubregion(subRegionName, subRegionAttrs);
+ assertNotNull(subRegionBefore);
+ assertEquals(true, subRegionBefore.getAttributes().getOffHeap());
+
+ IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.
+ LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+rootRegionName+"/"+subRegionName));
+ try {
+ testXml(cache);
+ } catch (IllegalStateException e) {
+ // expected
+ final String msg = LocalizedStrings.LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.
+ toLocalizedString("/" + rootRegionName + "/" + subRegionName);
+ assertEquals(msg, e.getMessage());
+ } finally {
+ expectedException.remove();
+ }
+ }
+
+ /**
+ * Test the ResourceManager element's critical-off-heap-percentage and
+ * eviction-off-heap-percentage attributes
+ * @throws Exception
+ */
+ public void testResourceManagerThresholds() throws Exception {
+ CacheCreation cache = new CacheCreation();
+ final float low = 90.0f;
+ final float high = 95.0f;
+
+ try {
+ System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+
+ Cache c;
+ ResourceManagerCreation rmc = new ResourceManagerCreation();
+ rmc.setEvictionOffHeapPercentage(low);
+ rmc.setCriticalOffHeapPercentage(high);
+ cache.setResourceManagerCreation(rmc);
+ testXml(cache);
+ {
+ c = getCache();
+ assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
+ assertEquals(high, c.getResourceManager().getCriticalOffHeapPercentage());
+ }
+ closeCache();
+
+ rmc = new ResourceManagerCreation();
+ // Set them to similar values
+ rmc.setEvictionOffHeapPercentage(low);
+ rmc.setCriticalOffHeapPercentage(low + 1);
+ cache.setResourceManagerCreation(rmc);
+ testXml(cache);
+ {
+ c = getCache();
+ assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
+ assertEquals(low + 1, c.getResourceManager().getCriticalOffHeapPercentage());
+ }
+ closeCache();
+
+ rmc = new ResourceManagerCreation();
+ rmc.setEvictionOffHeapPercentage(high);
+ rmc.setCriticalOffHeapPercentage(low);
+ cache.setResourceManagerCreation(rmc);
+ IgnoredException expectedException = IgnoredException.addIgnoredException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
+ try {
+ testXml(cache);
+ assertTrue(false);
+ } catch (IllegalArgumentException expected) {
+ } finally {
+ expectedException.remove();
+ closeCache();
+ }
+
+ // Disable eviction
+ rmc = new ResourceManagerCreation();
+ rmc.setEvictionOffHeapPercentage(0);
+ rmc.setCriticalOffHeapPercentage(low);
+ cache.setResourceManagerCreation(rmc);
+ testXml(cache);
+ {
+ c = getCache();
+ assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
+ assertEquals(low, c.getResourceManager().getCriticalOffHeapPercentage());
+ }
+ closeCache();
+
+ // Disable refusing ops in "red zone"
+ rmc = new ResourceManagerCreation();
+ rmc.setEvictionOffHeapPercentage(low);
+ rmc.setCriticalOffHeapPercentage(0);
+ cache.setResourceManagerCreation(rmc);
+ testXml(cache);
+ {
+ c = getCache();
+ assertEquals(low, c.getResourceManager().getEvictionOffHeapPercentage());
+ assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
+ }
+ closeCache();
+
+ // Disable both
+ rmc = new ResourceManagerCreation();
+ rmc.setEvictionOffHeapPercentage(0);
+ rmc.setCriticalOffHeapPercentage(0);
+ cache.setResourceManagerCreation(rmc);
+ testXml(cache);
+ c = getCache();
+ assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage());
+ assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage());
+ } finally {
+ System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
index 963f7ce..f308855 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
@@ -48,7 +48,7 @@ public class SharedConfigurationJUnitTest {
String schemaLocation = XmlUtils.getAttribute(doc.getDocumentElement(), W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION, W3C_XML_SCHEMA_INSTANCE_NS_URI);
assertNotNull(schemaLocation);
- assertEquals(CacheXml.NAMESPACE + " " + CacheXml.LATEST_SCHEMA_LOCATION, schemaLocation);
+ assertEquals(CacheXml.GEODE_NAMESPACE + " " + CacheXml.LATEST_SCHEMA_LOCATION, schemaLocation);
assertEquals(CacheXml.VERSION_LATEST, XmlUtils.getAttribute(doc.getDocumentElement(), "version"));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
new file mode 100644
index 0000000..f42d52c
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.gemstone.gemfire.internal.cache.xmlcache;
+
+import com.gemstone.gemfire.internal.ClassPathLoader;
+import org.junit.Test;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.EntityResolver2;
+
+import java.io.IOException;
+import java.util.ServiceLoader;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit test for {@link PivotalEntityResolver} and
+ * {@link DefaultEntityResolver2}.
+ */
+public abstract class AbstractEntityResolverTest {
+
+ public abstract EntityResolver getEntityResolver();
+
+ public abstract String getSystemId();
+
+ /**
+ * Assert that {@link PivotalEntityResolver} extends
+ * {@link DefaultEntityResolver2}.
+ *
+ * @since 8.1
+ */
+ @Test
+ public void testInstanceOfDefaultEntityResolver2() {
+ assertTrue(DefaultEntityResolver2.class.isAssignableFrom(getEntityResolver().getClass()));
+ }
+
+ /**
+ * Find the {@link PivotalEntityResolver} in the {@link ClassPathLoader}.
+ * Verifies that the META-INF/services file is correctly found and the the
+ * implementation class is loadable.
+ *
+ * @since 8.1
+ */
+ @Test
+ public void testDiscovery() {
+ boolean found = false;
+ final ServiceLoader<EntityResolver2> entityResolvers = ServiceLoader.load(EntityResolver2.class, ClassPathLoader.getLatestAsClassLoader());
+ for (final EntityResolver2 entityResolver : entityResolvers) {
+ if (getEntityResolver().getClass().isAssignableFrom(entityResolver.getClass())) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Resolver not found.", found);
+ }
+
+ /**
+ * Resolve the cache.xml XSD using the {@link PivotalEntityResolver}. Verifies
+ * that the META-INF/schemas files are correctly found.
+ *
+ * @throws SAXException
+ * @throws IOException
+ * @since 8.1
+ */
+ @Test
+ public void testResolveEntity() throws SAXException, IOException {
+ final InputSource inputSource = getEntityResolver().resolveEntity(null, getSystemId());
+ assertNotNull(inputSource);
+ assertEquals(getSystemId(), inputSource.getSystemId());
+ }
+
+ /**
+ * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
+ * <code>null</code> <code>systemId</code>. Asserts that returns to
+ * <code>null<code>.
+ *
+ * @throws SAXException
+ * @throws IOException
+ * @since 8.1
+ */
+ @Test
+ public void testResolveEntityNullSystemId() throws SAXException, IOException {
+ final String systemId = null;
+ final InputSource inputSource = getEntityResolver().resolveEntity(null, systemId);
+ assertNull(inputSource);
+ }
+
+ /**
+ * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
+ * <code>"--not-a-valid-system-id--"</code> <code>systemId</code>, which is
+ * not in the Pivotal namespace.. Asserts that returns to <code>null<code>.
+ *
+ * @throws SAXException
+ * @throws IOException
+ * @since 8.1
+ */
+ @Test
+ public void testResolveEntityUnkownSystemId() throws SAXException, IOException {
+ final String systemId = "--not-a-valid-system-id--";
+ final InputSource inputSource = getEntityResolver().resolveEntity(null, systemId);
+ assertNull(inputSource);
+ }
+
+ /**
+ * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
+ * <code>"http://schema.pivotal.io/this/should/be/not/found.xsd"</code>
+ * <code>systemId</code>, which should not be found. Asserts that returns to
+ * <code>null<code>.
+ *
+ * @throws SAXException
+ * @throws IOException
+ * @since 8.1
+ */
+ @Test
+ public void testResolveEntityNotFoundSystemId() throws SAXException, IOException {
+ final String systemId = "http://schema.pivotal.io/this/should/be/not/found.xsd";
+ final InputSource inputSource = getEntityResolver().resolveEntity(null, systemId);
+ assertNull(inputSource);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index eb4ce86..a51ce2b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -41,21 +41,21 @@ public class CacheXmlVersionJUnitTest {
*/
@Test
public void testOrdinal() {
- assertTrue(VERSION_3_0.compareTo(VERSION_4_0) < 0);
- assertTrue(VERSION_4_0.compareTo(VERSION_4_1) < 0);
- assertTrue(VERSION_4_1.compareTo(VERSION_5_0) < 0);
- assertTrue(VERSION_5_0.compareTo(VERSION_5_1) < 0);
- assertTrue(VERSION_5_1.compareTo(VERSION_5_5) < 0);
- assertTrue(VERSION_5_5.compareTo(VERSION_5_7) < 0);
- assertTrue(VERSION_5_7.compareTo(VERSION_5_8) < 0);
- assertTrue(VERSION_5_8.compareTo(VERSION_6_0) < 0);
- assertTrue(VERSION_6_0.compareTo(VERSION_6_1) < 0);
- assertTrue(VERSION_6_1.compareTo(VERSION_6_5) < 0);
- assertTrue(VERSION_6_5.compareTo(VERSION_6_6) < 0);
- assertTrue(VERSION_6_6.compareTo(VERSION_7_0) < 0);
- assertTrue(VERSION_7_0.compareTo(VERSION_8_0) < 0);
- assertTrue(VERSION_8_0.compareTo(VERSION_8_1) < 0);
- assertTrue(VERSION_8_1.compareTo(VERSION_9_0) < 0);
+ assertTrue(GEMFIRE_3_0.compareTo(GEMFIRE_4_0) < 0);
+ assertTrue(GEMFIRE_4_0.compareTo(GEMFIRE_4_1) < 0);
+ assertTrue(GEMFIRE_4_1.compareTo(GEMFIRE_5_0) < 0);
+ assertTrue(GEMFIRE_5_0.compareTo(GEMFIRE_5_1) < 0);
+ assertTrue(GEMFIRE_5_1.compareTo(GEMFIRE_5_5) < 0);
+ assertTrue(GEMFIRE_5_5.compareTo(GEMFIRE_5_7) < 0);
+ assertTrue(GEMFIRE_5_7.compareTo(GEMFIRE_5_8) < 0);
+ assertTrue(GEMFIRE_5_8.compareTo(GEMFIRE_6_0) < 0);
+ assertTrue(GEMFIRE_6_0.compareTo(GEMFIRE_6_1) < 0);
+ assertTrue(GEMFIRE_6_1.compareTo(GEMFIRE_6_5) < 0);
+ assertTrue(GEMFIRE_6_5.compareTo(GEMFIRE_6_6) < 0);
+ assertTrue(GEMFIRE_6_6.compareTo(GEMFIRE_7_0) < 0);
+ assertTrue(GEMFIRE_7_0.compareTo(GEMFIRE_8_0) < 0);
+ assertTrue(GEMFIRE_8_0.compareTo(GEMFIRE_8_1) < 0);
+ assertTrue(GEMFIRE_8_1.compareTo(GEODE_1_0) < 0);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
new file mode 100644
index 0000000..2fef8b3
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.gemstone.gemfire.internal.cache.xmlcache;
+
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.xml.sax.EntityResolver;
+
+/**
+ * Unit test for {@link GeodeEntityResolver} and
+ * {@link DefaultEntityResolver2}.
+ */
+@Category(UnitTest.class)
+public class GeodeEntityResolverJUnitTest extends AbstractEntityResolverTest {
+
+ private EntityResolver entityResolver;
+
+ private final String systemId = "http://geode.apache.org/schema/cache/cache-1.0.xsd";
+
+ @Before
+ public void setup() throws Exception {
+ entityResolver = new GeodeEntityResolver();
+ }
+
+ public EntityResolver getEntityResolver() {
+ return entityResolver;
+ }
+
+ public String getSystemId() {
+ return systemId;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
index 800e5ce..ce4941e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
@@ -17,19 +17,10 @@
package com.gemstone.gemfire.internal.cache.xmlcache;
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.ServiceLoader;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.EntityResolver2;
-
-import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.xml.sax.EntityResolver;
/**
* Unit test for {@link PivotalEntityResolver} and
@@ -39,106 +30,23 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
* @since 8.1
*/
@Category(UnitTest.class)
-public class PivotalEntityResolverJUnitTest {
+public class PivotalEntityResolverJUnitTest extends AbstractEntityResolverTest {
- /**
- * Assert that {@link PivotalEntityResolver} extends
- * {@link DefaultEntityResolver2}.
- *
- * @since 8.1
- */
- @Test
- public void testInstanceOfDefaultEntityResolver2() {
- assertTrue(DefaultEntityResolver2.class.isAssignableFrom(PivotalEntityResolver.class));
- }
-
- /**
- * Find the {@link PivotalEntityResolver} in the {@link ClassPathLoader}.
- * Verifies that the META-INF/services file is correctly found and the the
- * implementation class is loadable.
- *
- * @since 8.1
- */
- @Test
- public void testDiscovery() {
- boolean found = false;
- final ServiceLoader<EntityResolver2> entityResolvers = ServiceLoader.load(EntityResolver2.class, ClassPathLoader.getLatestAsClassLoader());
- for (final EntityResolver2 entityResolver : entityResolvers) {
- if (entityResolver instanceof PivotalEntityResolver) {
- found = true;
- break;
- }
- }
- assertTrue("Resolver not found.", found);
- }
+ private EntityResolver entityResolver;
- /**
- * Resolve the cache.xml XSD using the {@link PivotalEntityResolver}. Verifies
- * that the META-INF/schemas files are correctly found.
- *
- * @throws SAXException
- * @throws IOException
- * @since 8.1
- */
- @Test
- public void testResolveEntity() throws SAXException, IOException {
- final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
- final String systemId = "http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
- final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
- assertNotNull(inputSource);
- assertEquals(systemId, inputSource.getSystemId());
- }
+ private final String systemId = "http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
- /**
- * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
- * <code>null</code> <code>systemId</code>. Asserts that returns to
- * <code>null<code>.
- *
- * @throws SAXException
- * @throws IOException
- * @since 8.1
- */
- @Test
- public void testResolveEntityNullSystemId() throws SAXException, IOException {
- final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
- final String systemId = null;
- final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
- assertNull(inputSource);
+ @Before
+ public void setup() throws Exception {
+ entityResolver = new PivotalEntityResolver();
}
- /**
- * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
- * <code>"--not-a-valid-system-id--"</code> <code>systemId</code>, which is
- * not in the Pivotal namespace.. Asserts that returns to <code>null<code>.
- *
- * @throws SAXException
- * @throws IOException
- * @since 8.1
- */
- @Test
- public void testResolveEntityUnkownSystemId() throws SAXException, IOException {
- final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
- final String systemId = "--not-a-valid-system-id--";
- final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
- assertNull(inputSource);
+ public EntityResolver getEntityResolver() {
+ return entityResolver;
}
- /**
- * Test {@link PivotalEntityResolver#resolveEntity(String, String)} with
- * <code>"http://schema.pivotal.io/this/should/be/not/found.xsd"</code>
- * <code>systemId</code>, which shound not be found. Asserts that returns to
- * <code>null<code>.
- *
- * @throws SAXException
- * @throws IOException
- * @since 8.1
- */
- @Test
- public void testResolveEntityNotFoundSystemId() throws SAXException, IOException {
- final PivotalEntityResolver entityResolver = new PivotalEntityResolver();
- final String systemId = "http://schema.pivotal.io/this/should/be/not/found.xsd";
- final InputSource inputSource = entityResolver.resolveEntity(null, systemId);
- assertNull(inputSource);
+ public String getSystemId() {
+ return systemId;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
index bcb88c0..dca5d0b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -69,7 +69,7 @@ public class CacheElementJUnitTest {
*/
@Test
public void testCacheDefinedAsNestedComplexType8_1() throws Exception {
- Document doc = loadSchema(CacheXmlVersion.VERSION_8_1.getSchemaLocation());
+ Document doc = loadSchema(CacheXmlVersion.GEMFIRE_8_1.getSchemaLocation());
final XPathContext xPathContext = new XPathContext(CacheElement.XSD_PREFIX, XMLConstants.W3C_XML_SCHEMA_NS_URI);
final Node cacheType = XmlUtils.querySingleElement(doc.getFirstChild(), CacheElement.CACHE_TYPE_EMBEDDED, xPathContext);
assertNotNull("Cache type is not embedded complexType.", cacheType);
@@ -118,9 +118,9 @@ public class CacheElementJUnitTest {
assertEntry("gateway-conflict-resolver", order++, entries.next());
assertEntry("async-event-queue", order++, entries.next());
assertEntry("cache-server", order++, entries.next());
- assertEntry("bridge-server", order++, entries.next());
assertEntry("pool", order++, entries.next());
assertEntry("disk-store", order++, entries.next());
+ assertEntry("hdfs-store", order++, entries.next());
assertEntry("pdx", order++, entries.next());
assertEntry("region-attributes", order++, entries.next());
assertEntry("jndi-bindings", order++, entries.next());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index d8c52c6..ff4980d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -69,7 +69,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
@BeforeClass
public static void beforeClass() {
cache = new CacheFactory().set("mcast-port", "0").create();
- xPathContext.addNamespace(CacheXml.PREFIX, CacheXml.NAMESPACE);
+ xPathContext.addNamespace(CacheXml.PREFIX, CacheXml.GEODE_NAMESPACE);
xPathContext.addNamespace(TEST_PREFIX, TEST_NAMESPACE);
}
@@ -105,7 +105,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
nodes = XmlUtils.query(changes, xPath, xPathContext);
assertEquals(1, nodes.getLength());
Element element = (Element) nodes.item(0);
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final XmlEntity xmlEntity = XmlEntity.builder().withType("region").withAttribute("name", "r3").withConfig(changes).build();
XmlUtils.addNewNode(config, xmlEntity);
@@ -113,7 +113,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
nodes = XmlUtils.query(config, xPath, xPathContext);
assertEquals(1, nodes.getLength());
element = (Element) nodes.item(0);
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final List<Node> childNodes = getElementNodes(config.getFirstChild().getChildNodes());
@@ -158,7 +158,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
nodes = XmlUtils.query(changes, xPath, xPathContext);
assertEquals(1, nodes.getLength());
Element element = (Element) nodes.item(0);
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final XmlEntity xmlEntity = XmlEntity.builder().withType("jndi-bindings").withConfig(changes).build();
XmlUtils.addNewNode(config, xmlEntity);
@@ -166,7 +166,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
nodes = XmlUtils.query(config, xPath, xPathContext);
assertEquals(1, nodes.getLength());
element = (Element) nodes.item(0);
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final List<Node> childElements = getElementNodes(config.getFirstChild().getChildNodes());
assertEquals("pdx", childElements.get(2).getNodeName());
@@ -231,7 +231,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
Element element = (Element) nodes.item(0);
assertEquals(1, getElementNodes(element.getChildNodes()).size());
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
"XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml")));
@@ -239,7 +239,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
element = (Element) nodes.item(0);
assertEquals(0, element.getChildNodes().getLength());
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final XmlEntity xmlEntity = XmlEntity.builder().withType("region").withAttribute("name", "r1").withConfig(changes).build();
XmlUtils.addNewNode(config, xmlEntity);
@@ -248,7 +248,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
element = (Element) nodes.item(0);
assertEquals(0, element.getChildNodes().getLength());
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
}
/**
@@ -266,7 +266,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
Element element = (Element) nodes.item(0);
assertEquals("foo", XmlUtils.getAttribute(element, "disk-store-name"));
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
"XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml")));
@@ -274,7 +274,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
element = (Element) nodes.item(0);
assertEquals("bar", XmlUtils.getAttribute(element, "disk-store-name"));
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final XmlEntity xmlEntity = XmlEntity.builder().withType("pdx").withConfig(changes).build();
XmlUtils.addNewNode(config, xmlEntity);
@@ -283,7 +283,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
element = (Element) nodes.item(0);
assertEquals("bar", XmlUtils.getAttribute(element, "disk-store-name"));
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
}
/**
@@ -338,7 +338,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
Element element = (Element) nodes.item(0);
assertEquals(1, getElementNodes(element.getChildNodes()).size());
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
"XmlUtilsAddNewNodeJUnitTest.testDeleteNodeNamed.xml")));
@@ -367,7 +367,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
assertEquals(1, nodes.getLength());
Element element = (Element) nodes.item(0);
assertEquals("foo", XmlUtils.getAttribute(element, "disk-store-name"));
- assertEquals(CacheXml.NAMESPACE, element.getNamespaceURI());
+ assertEquals(CacheXml.GEODE_NAMESPACE, element.getNamespaceURI());
final Document changes = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
"XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml")));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index 0e14501..24702c3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -69,10 +69,10 @@ public class XmlUtilsJUnitTest {
assertNotNull(schemaLocationMap);
assertEquals(2, schemaLocationMap.size());
- final List<String> locations1 = schemaLocationMap.get("http://schema.pivotal.io/gemfire/cache");
+ final List<String> locations1 = schemaLocationMap.get("http://geode.apache.org/schema/cache");
assertNotNull(locations1);
assertEquals(1, locations1.size());
- assertEquals("http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd", locations1.get(0));
+ assertEquals("http://geode.apache.org/schema/cache/cache-1.0.xsd", locations1.get(0));
final List<String> locations2 = schemaLocationMap.get("urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest");
assertNotNull(locations2);
@@ -109,11 +109,11 @@ public class XmlUtilsJUnitTest {
assertNotNull(schemaLocationMap);
assertEquals(3, schemaLocationMap.size());
- final List<String> locations1 = schemaLocationMap.get("http://schema.pivotal.io/gemfire/cache");
+ final List<String> locations1 = schemaLocationMap.get("http://geode.apache.org/schema/cache");
assertNotNull(locations1);
assertEquals(2, locations1.size());
- assertEquals("http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd", locations1.get(0));
- assertEquals("cache-8.1.xsd", locations1.get(1));
+ assertEquals("http://geode.apache.org/schema/cache/cache-1.0.xsd", locations1.get(0));
+ assertEquals("cache-1.0.xsd", locations1.get(1));
final List<String> locations2 = schemaLocationMap.get("urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest");
assertNotNull(locations2);
@@ -179,7 +179,7 @@ public class XmlUtilsJUnitTest {
final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(this.getClass().getResourceAsStream(
"XmlUtilsJUnitTest.testQuerySingleElement.xml")));
final Element root = doc.getDocumentElement();
- final String cacheNamespace = "http://schema.pivotal.io/gemfire/cache";
+ final String cacheNamespace = "http://geode.apache.org/schema/cache";
final XPathContext cacheXPathContext = new XPathContext("cache", cacheNamespace);
// There are mulitple region elements, this should get the first one.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index a8f6514..222e63d 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -378,7 +378,7 @@ com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException,true,7079321411
com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException,true,1
com/gemstone/gemfire/internal/cache/wan/GatewaySenderException,true,8090143153569084886
com/gemstone/gemfire/internal/cache/wan/parallel/BucketRegionQueueUnavailableException,false
-com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion,false,publicId:java/lang/String,schemaLocation:java/lang/String,systemId:java/lang/String,version:java/lang/String
+com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion,false,namespace:java/lang/String,publicId:java/lang/String,schemaLocation:java/lang/String,systemId:java/lang/String,version:java/lang/String
com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation,false
com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation,true,2241078661206355376,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/ArrayList,cacheLoader:com/gemstone/gemfire/cache/CacheLoader,cacheWriter:com/gemstone/gemfire/cache/CacheWriter,cloningEnabled:boolean,compressor:com/gemstone/gemfire/compression/Compressor,concurrencyChecksEnabled:boolean,concurrencyLevel:int,customEntryIdleTimeout:com/gemstone/gemfire/cache/CustomExpiry,customEntryTimeToLive:com/gemstone/gemfire/cache/CustomExpiry,dataPolicy:com/gemstone/gemfire/cache/DataPolicy,diskDirs:java/io/File[],diskSizes:int[],diskStoreName:java/lang/String,diskWriteAttributes:com/gemstone/gemfire/cache/DiskWriteAttributes,earlyAck:boolean,enableAsyncConflation:boolean,enableSubscriptionConflation:boolean,entryIdleTimeout:com/gemstone/gemfire/cache/ExpirationAttributes,entryTimeToLive:com/gemstone/gemfire/cache/ExpirationAttributes,evictionAttributes:com/gemstone/gemfire/internal/cache/EvictionAttributesIm
pl,gatewaySenderIds:java/util/Set,hdfsStoreName:java/lang/String,hdfsWriteOnly:boolean,id:java/lang/String,ignoreJTA:boolean,indexMaintenanceSynchronous:boolean,initialCapacity:int,isDiskSynchronous:boolean,isLockGrantor:boolean,keyConstraint:java/lang/Class,loadFactor:float,membershipAttributes:com/gemstone/gemfire/cache/MembershipAttributes,multicastEnabled:boolean,offHeap:boolean,partitionAttributes:com/gemstone/gemfire/cache/PartitionAttributes,poolName:java/lang/String,publisher:boolean,refid:java/lang/String,regionIdleTimeout:com/gemstone/gemfire/cache/ExpirationAttributes,regionTimeToLive:com/gemstone/gemfire/cache/ExpirationAttributes,scope:com/gemstone/gemfire/cache/Scope,statisticsEnabled:boolean,subscriptionAttributes:com/gemstone/gemfire/cache/SubscriptionAttributes,valueConstraint:java/lang/Class
com/gemstone/gemfire/internal/concurrent/AtomicLong5,true,-1915700199064062938
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
index 269ddcf..d995b91 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
index 3055f31..62c21c3 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewNamed.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
index fb50e6b..b2695c7 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamed.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
index 38f791d..c51117b 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeNewUnnamedExtension.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
index 4f5b1a1..4139da0 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceNamed.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
index 4db3799..fd661f1 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamed.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
index a3238d8..2267ccd 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testAddNewNodeReplaceUnnamedExtension.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
index b325fbf..a461cc8 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.testDeleteNodeUnnamed.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
index bdefa30..bb19ce7 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd"
- version="8.1">
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
index 832d756..82d3920 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapAttribute.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd
urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest classpath:/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.xsd
urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest XmlUtilsJUnitTest.xsd"
- version="8.1">
+ version="1.0">
</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
index 05843bf..64a8fa4 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapEmptyAttribute.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
xsi:schemaLocation=""
- version="8.1">
+ version="1.0">
</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
index 87b3cac..5604ac9 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapMapOfStringListOfStringAttribute.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache cache-8.1.xsd
+ xsi:schemaLocation="http://geode.apache.org/schema/cache cache-1.0.xsd
urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest classpath:/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.xsd
urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest2 XmlUtilsJUnitTest2.xsd"
- version="8.1">
+ version="1.0">
</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
index 95d11b3..87997c1 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testBuildSchemaLocationMapNullAttribute.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
- version="8.1">
+ version="1.0">
</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
index 76b851e..4593074 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.testQuerySingleElement.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:test="urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd
+ xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd
urn:java:com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest XmlUtilsJUnitTest.xsd"
- version="8.1">
+ version="1.0">
<async-event-queue id="aeq1">
<async-event-listener>
<class-name>null</class-name>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
index bfe9f6c..6fd7306 100644
--- a/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
+++ b/geode-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd
@@ -23,22 +23,22 @@ limitations under the License.
version="1.0">
<xsd:import
- namespace="http://schema.pivotal.io/gemfire/cache"
- schemaLocation="http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"/>
+ namespace="http://geode.apache.org/schema/cache"
+ schemaLocation="http://geode.apache.org/schema/cache/cache-1.0.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[
XML schema for Lucene indexes in Geode.
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:lucene="http://geode.apache.org/schema/lucene"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
- http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
http://geode.apache.org/schema/lucene
http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
- version="9.0">
+ version="1.0">
]]></xsd:documentation>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
index 47f3250..89d5bef 100644
--- a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
@@ -17,14 +17,14 @@
-->
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:lucene="http://geode.apache.org/schema/lucene"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
- http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
http://geode.apache.org/schema/lucene
http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
- version="9.0">
+ version="1.0">
<region name="region" refid="PARTITION">
<lucene:index name="index1">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
index 47f3250..89d5bef 100644
--- a/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
+++ b/geode-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
@@ -17,14 +17,14 @@
-->
<cache
- xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns="http://geode.apache.org/schema/cache"
xmlns:lucene="http://geode.apache.org/schema/lucene"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
- http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
http://geode.apache.org/schema/lucene
http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
- version="9.0">
+ version="1.0">
<region name="region" refid="PARTITION">
<lucene:index name="index1">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1cf90eb/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
index 72f4d2f..fe9da93 100755
--- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
+++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
@@ -144,10 +144,10 @@ public class AutoBalancerIntegrationJUnitTest {
@Test
public void testInitializerCacheXML() {
- String configStr = "<cache xmlns=\"http://schema.pivotal.io/gemfire/cache\" "
+ String configStr = "<cache xmlns=\"http://geode.apache.org/schema/cache\" "
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
- + " xsi:schemaLocation=\"http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd\""
- + " version=\"9.0\"> "
+ + " xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\""
+ + " version=\"1.0\"> "
+ " <initializer> "
+ " <class-name>com.gemstone.gemfire.cache.util.AutoBalancer</class-name> "
+ " <parameter name=\"schedule\"> "
@@ -161,10 +161,10 @@ public class AutoBalancerIntegrationJUnitTest {
@Test(expected = GemFireConfigException.class)
public void testInitFailOnMissingScheduleConf() {
- String configStr = "<cache xmlns=\"http://schema.pivotal.io/gemfire/cache\" "
+ String configStr = "<cache xmlns=\"http://geode.apache.org/schema/cache\" "
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
- + " xsi:schemaLocation=\"http://schema.pivotal.io/gemfire/cache http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd\""
- + " version=\"9.0\"> "
+ + " xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\""
+ + " version=\"1.0\"> "
+ " <initializer> "
+ " <class-name>com.gemstone.gemfire.cache.util.AutoBalancer</class-name> "
+ " </initializer> "