GEODE-617: Change xsd namespace for lucene to geode.apache.org
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e414a493 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e414a493 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e414a493 Branch: refs/heads/feature/GEODE-291 Commit: e414a493325d9742772e647965e1bcd1f45650d1 Parents: dec83b4 Author: Dan Smith <[email protected]> Authored: Tue Dec 1 16:42:08 2015 -0800 Committer: Dan Smith <[email protected]> Committed: Mon Dec 7 10:10:52 2015 -0800 ---------------------------------------------------------------------- .../cache/xmlcache/GeodeEntityResolver.java | 8 +-- .../lucene/internal/xml/LuceneXmlConstants.java | 2 +- .../geode.apache.org/lucene/lucene-1.0.xsd | 57 +++++++++++++++++++ .../lucene/lucene-1.0.xsd | 58 -------------------- ...erIntegrationJUnitTest.createIndex.cache.xml | 6 +- ...serIntegrationJUnitTest.parseIndex.cache.xml | 6 +- 6 files changed, 68 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e414a493/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java index 559a1f8..67cda99 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java @@ -26,8 +26,8 @@ import org.xml.sax.ext.EntityResolver2; /** * Resolves entities for XSDs or DTDs with SYSTEM IDs rooted at - * http://www.pivotal.io/xml/ns from the classpath at - * /META-INF/schemas/schema.pivotal.io/. + * http://geode.apache.org/schema from the classpath at + * /META-INF/schemas/geode.apache.org/. * * Loaded by {@link ServiceLoader} on {@link EntityResolver2} class. See file * <code>META-INF/services/org.xml.sax.ext.EntityResolver2</code> @@ -38,9 +38,9 @@ import org.xml.sax.ext.EntityResolver2; */ public final class GeodeEntityResolver extends DefaultEntityResolver2 { - private static final String SYSTEM_ID_ROOT = "http://geode.incubator.apache.org/schema";; + private static final String SYSTEM_ID_ROOT = "http://geode.apache.org/schema";; - private static final String CLASSPATH_ROOT = "/META-INF/schemas/geode.incubator.apache.org/"; + private static final String CLASSPATH_ROOT = "/META-INF/schemas/geode.apache.org/"; @Override public InputSource resolveEntity(final String name, final String publicId, final String baseURI, final String systemId) throws SAXException, IOException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e414a493/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java index 303424e..bc80180 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java @@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.lucene.internal.xml; public class LuceneXmlConstants { - public static final String NAMESPACE= "http://geode.incubator.apache.org/schema/lucene";; + public static final String NAMESPACE= "http://geode.apache.org/schema/lucene";; public static final String PREFIX = "lucene"; public static final String SERVICE = "service"; public static final String NAME = "name"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e414a493/gemfire-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd new file mode 100644 index 0000000..bfe9f6c --- /dev/null +++ b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.apache.org/lucene/lucene-1.0.xsd @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<xsd:schema + targetNamespace="http://geode.apache.org/schema/lucene"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:import + namespace="http://schema.pivotal.io/gemfire/cache"; + schemaLocation="http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"/> + + <xsd:annotation> + <xsd:documentation><![CDATA[ +XML schema for Lucene indexes in Geode. + + <cache + xmlns="http://schema.pivotal.io/gemfire/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 + http://geode.apache.org/schema/lucene + http://geode.apache.org/schema/lucene/lucene-1.0.xsd"; + version="9.0"> + + ]]></xsd:documentation> + </xsd:annotation> + <xsd:element name="index"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="field" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + </xsd:element> +</xsd:schema> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e414a493/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd deleted file mode 100644 index b1eae03..0000000 --- a/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<xsd:schema - targetNamespace="http://geode.incubator.apache.org/schema/lucene"; - xmlns:gpdb="http://geode.incubator.apache.org/schema/lucene"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="1.0"> - - <xsd:import - namespace="http://schema.pivotal.io/gemfire/cache"; - schemaLocation="http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"/> - - <xsd:annotation> - <xsd:documentation><![CDATA[ -XML schema for Lucene indexes in Geode. - - <cache - xmlns="http://schema.pivotal.io/gemfire/cache"; - xmlns:lucene="http://geode.incubator.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 - http://geode.incubator.apache.org/schema/lucene - http://geode.incubator.apache.org/schema/lucene/lucene-1.0.xsd"; - version="9.0"> - - ]]></xsd:documentation> - </xsd:annotation> - <xsd:element name="index"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="field" maxOccurs="unbounded"> - <xsd:complexType> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string"/> - </xsd:complexType> - </xsd:element> -</xsd:schema> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e414a493/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml index 7f804e0..42e4e84 100644 --- a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml +++ b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <cache xmlns="http://schema.pivotal.io/gemfire/cache"; - xmlns:lucene="http://geode.incubator.apache.org/schema/lucene"; + 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 - http://geode.incubator.apache.org/schema/lucene - http://geode.incubator.apache.org/schema/lucene/lucene-1.0.xsd"; + http://geode.apache.org/schema/lucene + http://geode.apache.org/schema/lucene/lucene-1.0.xsd"; version="9.0"> <region name="region" refid="PARTITION"> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e414a493/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml index 7f804e0..42e4e84 100644 --- a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml +++ b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <cache xmlns="http://schema.pivotal.io/gemfire/cache"; - xmlns:lucene="http://geode.incubator.apache.org/schema/lucene"; + 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 - http://geode.incubator.apache.org/schema/lucene - http://geode.incubator.apache.org/schema/lucene/lucene-1.0.xsd"; + http://geode.apache.org/schema/lucene + http://geode.apache.org/schema/lucene/lucene-1.0.xsd"; version="9.0"> <region name="region" refid="PARTITION">
