RYA-458 Updating the configuration XML so that you may only specify a single QueryChangeLogSource.
diff --git a/extras/rya.streams/query-manager/src/main/config/configuration.xml b/extras/rya.streams/query-manager/src/main/config/configuration.xml
index b78900e..a5e3fb6 100644
--- a/extras/rya.streams/query-manager/src/main/config/configuration.xml
+++ b/extras/rya.streams/query-manager/src/main/config/configuration.xml
@@ -18,19 +18,17 @@
under the License.
-->
<queryManagerConfig>
- <!-- A list of Query Change Log Sources. A source needs to be defined for
- - every system that is used to manage Rya Streams Query Change Logs.
- - The query manager will manage queries for all Rya instances whose
- - change logs are stored within those sources.
+ <!-- The Query Change Log Sources. The source defines a system where Rya
+ - Streams Query Change Logs are managed. The query manager will manage
+ - queries for all Rya instances whose change logs are stored within the
+ - source.
-->
- <queryChangeLogSources>
- <queryChangeLogSource>
- <kafka>
- <hostname>[Kafka Broker Hostname]</hostname>
- <port>[Kafka Broker Port]</port>
- </kafka>
- </queryChangeLogSource>
- </queryChangeLogSources>
+ <queryChangeLogSource>
+ <kafka>
+ <hostname>[Kafka Broker Hostname]</hostname>
+ <port>[Kafka Broker Port]</port>
+ </kafka>
+ </queryChangeLogSource>
<!-- This section defines performance related tuning values. Sensible
- default have been provided to simplify configuration.
diff --git a/extras/rya.streams/query-manager/src/main/xsd/QueryManagerConfig.xsd b/extras/rya.streams/query-manager/src/main/xsd/QueryManagerConfig.xsd
index 17d667f..c1285d4 100644
--- a/extras/rya.streams/query-manager/src/main/xsd/QueryManagerConfig.xsd
+++ b/extras/rya.streams/query-manager/src/main/xsd/QueryManagerConfig.xsd
@@ -23,17 +23,11 @@
<xs:element name="queryManagerConfig">
<xs:complexType>
<xs:sequence>
- <xs:element name="queryChangeLogSources">
+ <xs:element name="queryChangeLogSource">
<xs:complexType>
- <xs:sequence>
- <xs:element name="queryChangeLogSource" maxOccurs="unbounded">
- <xs:complexType>
- <xs:choice>
- <xs:element name="kafka" type="kafka"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
+ <xs:choice>
+ <xs:element name="kafka" type="kafka"/>
+ </xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="performanceTunning">
diff --git a/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/xml/QueryManagerConfigMarshallerTest.java b/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/xml/QueryManagerConfigMarshallerTest.java
index bc8a040..831c06b 100644
--- a/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/xml/QueryManagerConfigMarshallerTest.java
+++ b/extras/rya.streams/query-manager/src/test/java/org/apache/rya/streams/querymanager/xml/QueryManagerConfigMarshallerTest.java
@@ -36,14 +36,12 @@
final String xml =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<queryManagerConfig>\n" +
- " <queryChangeLogSources>\n" +
- " <queryChangeLogSource>\n" +
- " <kafka>\n" +
- " <hostname>localhost</hostname>\n" +
- " <port>6</port>\n" +
- " </kafka>\n" +
- " </queryChangeLogSource>\n" +
- " </queryChangeLogSources>\n" +
+ " <queryChangeLogSource>\n" +
+ " <kafka>\n" +
+ " <hostname>localhost</hostname>\n" +
+ " <port>6</port>\n" +
+ " </kafka>\n" +
+ " </queryChangeLogSource>\n" +
" <performanceTunning>\n" +
" <queryChanngeLogDiscoveryPeriod>\n" +
" <value>1</value>\n" +
@@ -62,14 +60,12 @@
final String xml =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<queryManagerConfig>\n" +
- " <queryChangeLogSources>\n" +
- " <queryChangeLogSource>\n" +
- " <kafka>\n" +
- " <hostname>localhost</hostname>\n" +
- " <port>6</port>\n" +
- " </kafka>\n" +
- " </queryChangeLogSource>\n" +
- " </queryChangeLogSources>\n" +
+ " <queryChangeLogSource>\n" +
+ " <kafka>\n" +
+ " <hostname>localhost</hostname>\n" +
+ " <port>6</port>\n" +
+ " </kafka>\n" +
+ " </queryChangeLogSource>\n" +
"</queryManagerConfig>";