Skip to content

Commit e80ddd2

Browse files
akonczakakonczak
committed
DATAES-103 - fix for schema parsing errors with Spring 4.0.x
1 parent 9a8c04c commit e80ddd2

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

‎src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
xmlns:tool="http://www.springframework.org/schema/tool"
66
xmlns:repository="http://www.springframework.org/schema/data/repository"
77
targetNamespace="http://www.springframework.org/schema/data/elasticsearch"
8-
elementFormDefault="qualified" attributeFormDefault="unqualified">
8+
elementFormDefault="qualified"
9+
attributeFormDefault="unqualified">
910

1011
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
1112
<xsd:import namespace="http://www.springframework.org/schema/tool"/>
@@ -37,7 +38,7 @@
3738

3839
<xsd:element name="node-client">
3940
<xsd:annotation>
40-
<xsd:documentation source="java: org.springframework.data.elasticsearch.client.NodeClientFactoryBean"/>
41+
<xsd:documentation/>
4142
<xsd:appinfo>
4243
<tool:assignable-to type="org.elasticsearch.client.Client"/>
4344
</xsd:appinfo>
@@ -48,28 +49,31 @@
4849
<xsd:attribute name="local" type="xsd:boolean" default="false">
4950
<xsd:annotation>
5051
<xsd:documentation>
51-
<![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>
52+
<![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]]>
53+
</xsd:documentation>
5254
</xsd:annotation>
5355
</xsd:attribute>
5456
<xsd:attribute name="cluster-name" type="xsd:string" default="elasticsearch">
5557
<xsd:annotation>
5658
<xsd:documentation>
57-
<![CDATA[Name of the cluster in which this instance of node client will connect to]]> </xsd:documentation>
59+
<![CDATA[Name of the cluster in which this instance of node client will connect to]]>
60+
</xsd:documentation>
5861
</xsd:annotation>
5962
</xsd:attribute>
6063
<xsd:attribute name="http-enabled" type="xsd:boolean" default="true">
6164
<xsd:annotation>
62-
<xsd:documentation><![CDATA[to enable or desable http port]]> </xsd:documentation>
65+
<xsd:documentation>
66+
<![CDATA[ to enable or disable http port ]]>
67+
</xsd:documentation>
6368
</xsd:annotation>
6469
</xsd:attribute>
6570
</xsd:extension>
6671
</xsd:complexContent>
6772
</xsd:complexType>
6873
</xsd:element>
69-
7074
<xsd:element name="transport-client">
7175
<xsd:annotation>
72-
<xsd:documentation source="java: org.springframework.data.elasticsearch.client.TransportClientFactoryBean"/>
76+
<xsd:documentation/>
7377
<xsd:appinfo>
7478
<tool:assignable-to type="org.elasticsearch.client.Client"/>
7579
</xsd:appinfo>
@@ -80,42 +84,47 @@
8084
<xsd:attribute name="cluster-nodes" type="xsd:string" default="127.0.0.1:9300">
8185
<xsd:annotation>
8286
<xsd:documentation>
83-
<![CDATA[The comma delimited list of host:port entries to use for elasticsearch cluster.]]></xsd:documentation>
87+
<![CDATA[The comma delimited list of host:port entries to use for elasticsearch cluster.]]>
88+
</xsd:documentation>
8489
</xsd:annotation>
8590
</xsd:attribute>
8691
<xsd:attribute name="cluster-name" type="xsd:string" default="elasticsearch">
8792
<xsd:annotation>
8893
<xsd:documentation>
89-
<![CDATA[Name of the cluster in which this instance of node client will connect to]]> </xsd:documentation>
94+
<![CDATA[Name of the cluster in which this instance of node client will connect to]]>
95+
</xsd:documentation>
9096
</xsd:annotation>
9197
</xsd:attribute>
9298
<xsd:attribute name="client-transport-sniff" type="xsd:boolean" default="true">
9399
<xsd:annotation>
94100
<xsd:documentation>
95-
<![CDATA[The client allows to sniff the rest of the cluster, and add those into its list of machines to use.]]> </xsd:documentation>
101+
<![CDATA[The client allows to sniff the rest of the cluster, and add those into its list of machines to use.]]>
102+
</xsd:documentation>
96103
</xsd:annotation>
97104
</xsd:attribute>
98105
<xsd:attribute name="client-transport-ignore-cluster-name" type="xsd:boolean" default="false">
99106
<xsd:annotation>
100107
<xsd:documentation>
101-
<![CDATA[Set to true to ignore cluster name validation of connected nodes. (since 0.19.4)]]> </xsd:documentation>
108+
<![CDATA[Set to true to ignore cluster name validation of connected nodes. (since 0.19.4)]]>
109+
</xsd:documentation>
102110
</xsd:annotation>
103111
</xsd:attribute>
104112
<xsd:attribute name="client-transport-ping-timeout" type="xsd:string" default="5s">
105113
<xsd:annotation>
106114
<xsd:documentation>
107-
<![CDATA[The time to wait for a ping response from a node. Defaults to 5s.]]> </xsd:documentation>
115+
<![CDATA[The time to wait for a ping response from a node. Defaults to 5s.]]>
116+
</xsd:documentation>
108117
</xsd:annotation>
109118
</xsd:attribute>
110119
<xsd:attribute name="client-transport-nodes-sampler-interval" type="xsd:string" default="5s">
111120
<xsd:annotation>
112121
<xsd:documentation>
113-
<![CDATA[How often to sample / ping the nodes listed and connected. Defaults to 5s.]]> </xsd:documentation>
122+
<![CDATA[How often to sample / ping the nodes listed and connected. Defaults to 5s.]]>
123+
</xsd:documentation>
114124
</xsd:annotation>
115125
</xsd:attribute>
116126
</xsd:extension>
117127
</xsd:complexContent>
118128
</xsd:complexType>
119129
</xsd:element>
120-
121-
</xsd:schema>
130+
</xsd:schema>

0 commit comments

Comments
 (0)