1) fixed issue 506 (BetaBlocker) 2) configurable CC ports 3) cosmetic changes for indented output of describe -admin command
diff --git a/asterix-events/src/main/resources/schema/cluster.xsd b/asterix-events/src/main/resources/schema/cluster.xsd
index c0cd309..f0d5bd9 100644
--- a/asterix-events/src/main/resources/schema/cluster.xsd
+++ b/asterix-events/src/main/resources/schema/cluster.xsd
@@ -18,9 +18,9 @@
<xs:element name="java_home" type="xs:string" />
<xs:element name="username" type="xs:string" />
<xs:element name="web_port" type="xs:string" />
- <xs:element name="client_port" type="xs:string" />
- <xs:element name="cluster_port" type="xs:string" />
- <xs:element name="http_port" type="xs:string" />
+ <xs:element name="client_port" type="xs:integer" />
+ <xs:element name="cluster_port" type="xs:integer" />
+ <xs:element name="http_port" type="xs:integer" />
<!-- definition of complex elements -->
<xs:element name="working_dir">
@@ -40,6 +40,9 @@
<xs:element ref="cl:cluster_ip" />
<xs:element ref="cl:java_home" minOccurs="0" />
<xs:element ref="cl:log_dir" minOccurs="0" />
+ <xs:element ref="cl:client_port" />
+ <xs:element ref="cl:cluster_port" />
+ <xs:element ref="cl:http_port" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -53,17 +56,6 @@
</xs:complexType>
</xs:element>
- <xs:element name="ports">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="cl:web_port" />
- <xs:element ref="cl:client_port" />
- <xs:element ref="cl:cluster_port" />
- <xs:element ref="cl:http_port" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
<xs:element name="env">
<xs:complexType>
<xs:sequence>
@@ -97,7 +89,6 @@
<xs:element ref="cl:txn_log_dir" minOccurs="0" />
<xs:element ref="cl:store" minOccurs="0" />
<xs:element ref="cl:iodevices" minOccurs="0" />
- <xs:element ref="cl:ports" />
<xs:element ref="cl:working_dir" />
<xs:element ref="cl:master_node" />
<xs:element ref="cl:node" maxOccurs="unbounded" />