From e80ddd249fe3cc3f7d3c6cb1fd4dd0c53ba2b899 Mon Sep 17 00:00:00 2001
From: Artur Konczak <akonczak@gmail.com>
Date: Sat, 20 Jun 2015 23:02:54 +0100
Subject: [PATCH] DATAES-103 - fix for schema parsing errors with Spring 4.0.x

---
 .../config/spring-elasticsearch-1.0.xsd       | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd b/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd
index 117ca2a09..7274ad0bd 100644
--- a/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd
+++ b/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd
@@ -5,7 +5,8 @@
             xmlns:tool="http://www.springframework.org/schema/tool"
             xmlns:repository="http://www.springframework.org/schema/data/repository"
             targetNamespace="http://www.springframework.org/schema/data/elasticsearch"
-            elementFormDefault="qualified" attributeFormDefault="unqualified">
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>
     <xsd:import namespace="http://www.springframework.org/schema/tool"/>
@@ -37,7 +38,7 @@
 
     <xsd:element name="node-client">
         <xsd:annotation>
-            <xsd:documentation source="java: org.springframework.data.elasticsearch.client.NodeClientFactoryBean"/>
+            <xsd:documentation/>
             <xsd:appinfo>
                 <tool:assignable-to type="org.elasticsearch.client.Client"/>
             </xsd:appinfo>
@@ -48,28 +49,31 @@
                     <xsd:attribute name="local" type="xsd:boolean" default="false">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[local here means local on the JVM (well, actually class loader) level, meaning that two local servers started within the same JVM will discover themselves and form a cluster]]></xsd:documentation>
+                                <![CDATA[local here means local on the JVM (well, actually class loader) level, meaning that two local servers started within the same JVM will discover themselves and form a cluster]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="cluster-name" type="xsd:string" default="elasticsearch">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[Name of the cluster in which this instance of node client will connect to]]> </xsd:documentation>
+                                <![CDATA[Name of the cluster in which this instance of node client will connect to]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="http-enabled" type="xsd:boolean" default="true">
                         <xsd:annotation>
-                            <xsd:documentation><![CDATA[to enable or desable http port]]> </xsd:documentation>
+                            <xsd:documentation>
+                                <![CDATA[ to enable or disable http port ]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                 </xsd:extension>
             </xsd:complexContent>
         </xsd:complexType>
     </xsd:element>
-
     <xsd:element name="transport-client">
         <xsd:annotation>
-            <xsd:documentation source="java: org.springframework.data.elasticsearch.client.TransportClientFactoryBean"/>
+            <xsd:documentation/>
             <xsd:appinfo>
                 <tool:assignable-to type="org.elasticsearch.client.Client"/>
             </xsd:appinfo>
@@ -80,42 +84,47 @@
                     <xsd:attribute name="cluster-nodes" type="xsd:string" default="127.0.0.1:9300">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[The comma delimited list of host:port entries to use for elasticsearch cluster.]]></xsd:documentation>
+                                <![CDATA[The comma delimited list of host:port entries to use for elasticsearch cluster.]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="cluster-name" type="xsd:string" default="elasticsearch">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[Name of the cluster in which this instance of node client will connect to]]> </xsd:documentation>
+                                <![CDATA[Name of the cluster in which this instance of node client will connect to]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="client-transport-sniff" type="xsd:boolean" default="true">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[The client allows to sniff the rest of the cluster, and add those into its list of machines to use.]]> </xsd:documentation>
+                                <![CDATA[The client allows to sniff the rest of the cluster, and add those into its list of machines to use.]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="client-transport-ignore-cluster-name" type="xsd:boolean" default="false">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[Set to true to ignore cluster name validation of connected nodes. (since 0.19.4)]]> </xsd:documentation>
+                                <![CDATA[Set to true to ignore cluster name validation of connected nodes. (since 0.19.4)]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="client-transport-ping-timeout" type="xsd:string" default="5s">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[The time to wait for a ping response from a node. Defaults to 5s.]]> </xsd:documentation>
+                                <![CDATA[The time to wait for a ping response from a node. Defaults to 5s.]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                     <xsd:attribute name="client-transport-nodes-sampler-interval" type="xsd:string" default="5s">
                         <xsd:annotation>
                             <xsd:documentation>
-                                <![CDATA[How often to sample / ping the nodes listed and connected. Defaults to 5s.]]> </xsd:documentation>
+                                <![CDATA[How often to sample / ping the nodes listed and connected. Defaults to 5s.]]>
+                            </xsd:documentation>
                         </xsd:annotation>
                     </xsd:attribute>
                 </xsd:extension>
             </xsd:complexContent>
         </xsd:complexType>
     </xsd:element>
-
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>