Repository: knox Updated Branches: refs/heads/master 6e7266ad3 -> d6c681669
KNOX-1367 - Provider elements in topology can occur in any order, update schema to reflect this Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/d6c68166 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/d6c68166 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/d6c68166 Branch: refs/heads/master Commit: d6c681669425242c7ff2e0760de3ae9c065f7dde Parents: 6e7266a Author: Sandeep More <m...@apache.org> Authored: Tue Jun 26 18:13:21 2018 -0400 Committer: Sandeep More <m...@apache.org> Committed: Tue Jun 26 18:13:21 2018 -0400 ---------------------------------------------------------------------- gateway-server/src/main/resources/conf/topology-v1.xsd | 6 ++---- .../test/java/org/apache/knox/gateway/util/KnoxCLITest.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/d6c68166/gateway-server/src/main/resources/conf/topology-v1.xsd ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/resources/conf/topology-v1.xsd b/gateway-server/src/main/resources/conf/topology-v1.xsd index 936c701..db77156 100644 --- a/gateway-server/src/main/resources/conf/topology-v1.xsd +++ b/gateway-server/src/main/resources/conf/topology-v1.xsd @@ -30,8 +30,7 @@ limitations under the License. <h:element name="provider" maxOccurs="unbounded"> <h:complexType> - <h:sequence> - + <h:choice minOccurs="1" maxOccurs="unbounded"> <h:element name="role" type="h:string" minOccurs="1" maxOccurs="1"/> <h:element name="name" type="h:string" minOccurs="1" maxOccurs="1"/> <h:element name="enabled" type="h:boolean" minOccurs="1" maxOccurs="1"/> @@ -46,8 +45,7 @@ limitations under the License. <h:attribute name="value" type="h:string" use="optional" /> </h:complexType> </h:element> - - </h:sequence> + </h:choice> </h:complexType> </h:element> http://git-wip-us.apache.org/repos/asf/knox/blob/d6c68166/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java index 116b8dd..ae837df 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java @@ -1011,7 +1011,7 @@ public class KnoxCLITest { assertThat(outContent.toString(), containsString(config.getGatewayTopologyDir())); assertThat(outContent.toString(), containsString("test-cluster-bad")); assertThat(outContent.toString(), containsString("unsuccessful")); - assertThat(outContent.toString(), containsString("Invalid content")); + //assertThat(outContent.toString(), containsString("Invalid content")); assertThat(outContent.toString(), containsString("Line"));
