minor cosmetic changes to cluster configuration xml schema
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_ioc@1371 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java b/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java
index 04c6333..0157f65 100644
--- a/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java
+++ b/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java
@@ -51,7 +51,8 @@
String val = node.getJavaHome() == null ? p.getValue() : node.getJavaHome();
envBuffer.append(p.getKey() + "=" + val + " ");
} else if (p.getKey().equals("JAVA_OPTS")) {
- String val = "\"" + "-Xmx" + (node.getRam() == null ? cluster.getRam() : node.getRam());
+ String val = "\"" + "-Xmx"
+ + (node.getJavaHeap() == null ? cluster.getJavaHeap() : node.getJavaHeap());
if (node.getDebug() != null) {
val = val + " " + "-Xdebug -Xrunjdwp:transport=dt_socket,address=" + node.getDebug().intValue()
+ "," + "server=y,suspend=n";
diff --git a/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventUtil.java b/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventUtil.java
index e3de560..bf31e9f 100644
--- a/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventUtil.java
+++ b/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventUtil.java
@@ -181,8 +181,8 @@
}
if (nodeid.equals(cluster.getMasterNode().getId())) {
- String ram = cluster.getMasterNode().getRam() == null ? cluster
- .getRam() : cluster.getMasterNode().getRam();
+ String ram = cluster.getMasterNode().getJavaHeap() == null ? cluster
+ .getJavaHeap() : cluster.getMasterNode().getJavaHeap();
String logDir = cluster.getMasterNode().getLogdir() == null ? cluster
.getLogdir() : cluster.getMasterNode().getLogdir();
String javaHome = cluster.getMasterNode().getJavaHome() == null ? cluster
diff --git a/asterix-events/src/main/resources/schema/cluster.xsd b/asterix-events/src/main/resources/schema/cluster.xsd
index eaf343d..38afda3 100644
--- a/asterix-events/src/main/resources/schema/cluster.xsd
+++ b/asterix-events/src/main/resources/schema/cluster.xsd
@@ -3,7 +3,7 @@
<!-- definition of simple types -->
<xs:element name="name" type="xs:string"/>
-<xs:element name="ram" type="xs:string"/>
+<xs:element name="java_heap" type="xs:string"/>
<xs:element name="logdir" type="xs:string"/>
<xs:element name="id" type="xs:string"/>
<xs:element name="ip" type="xs:string"/>
@@ -34,7 +34,7 @@
<xs:element ref="cl:ip"/>
<xs:element ref="cl:cluster-ip"/>
<xs:element ref="cl:java_home" minOccurs="0"/>
- <xs:element ref="cl:ram" minOccurs="0"/>
+ <xs:element ref="cl:java_heap" minOccurs="0"/>
<xs:element ref="cl:logdir" minOccurs="0"/>
<xs:element ref="cl:debug" minOccurs="0"/>
</xs:sequence>
@@ -63,7 +63,7 @@
<xs:sequence>
<xs:element ref="cl:id"/>
<xs:element ref="cl:ip"/>
- <xs:element ref="cl:ram" minOccurs="0"/>
+ <xs:element ref="cl:java_heap" minOccurs="0"/>
<xs:element ref="cl:java_home" minOccurs="0"/>
<xs:element ref="cl:logdir" minOccurs="0"/>
<xs:element ref="cl:store" minOccurs="0"/>
@@ -78,7 +78,7 @@
<xs:element ref="cl:name"/>
<xs:element ref="cl:username"/>
<xs:element ref="cl:env" minOccurs="0"/>
- <xs:element ref="cl:ram" minOccurs="0"/>
+ <xs:element ref="cl:java_heap" minOccurs="0"/>
<xs:element ref="cl:java_home" minOccurs="0"/>
<xs:element ref="cl:logdir" minOccurs="0"/>
<xs:element ref="cl:store" minOccurs="0"/>