modules/common/cassandra-bundle/src/main/java/org/rhq/cassandra/bundle/DeploymentOptions.java | 14 +++++-----
modules/common/cassandra-bundle/src/main/resources/cassandra.properties | 2 -
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 01e728c1999fa2269b9233767758f20b44a58b3a
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Sep 30 20:10:42 2012 -0400
Changing deployment property cluster.type property to is-embedded
After having thought more about the differnet deployment scenarios, I think we
will have either embedded or non-embeeded clusters. A boolean makes more sense
in this case.
diff --git a/modules/common/cassandra-bundle/src/main/java/org/rhq/cassandra/bundle/DeploymentOptions.java b/modules/common/cassandra-bundle/src/main/java/org/rhq/cassandra/bundle/DeploymentOptions.java
index 93fada3..fd1e284 100644
--- a/modules/common/cassandra-bundle/src/main/java/org/rhq/cassandra/bundle/DeploymentOptions.java
+++ b/modules/common/cassandra-bundle/src/main/java/org/rhq/cassandra/bundle/DeploymentOptions.java
@@ -38,7 +38,7 @@ public class DeploymentOptions {
private String clusterDir;
private Integer numNodes;
private Boolean autoDeploy;
- private String clusterType;
+ private Boolean embedded;
public DeploymentOptions(Properties properties) {
setBundleFileName(properties.getProperty("rhq.cassandra.bundle.filename"));
@@ -47,7 +47,7 @@ public class DeploymentOptions {
setClusterDir(properties.getProperty("rhq.cassandra.cluster.dir"));
setNumNodes(Integer.parseInt(properties.getProperty("rhq.cassandra.cluster.num-nodes")));
setAutoDeploy(Boolean.valueOf(properties.getProperty("rhq.cassandra.cluster.auto-deploy")));
- setClusterType(properties.getProperty("rhq.cassandra.cluster.type"));
+ setEmbedded(Boolean.valueOf(properties.getProperty("rhq.cassandra.cluster.is-embedded")));
}
public String getBundleFileName() {
@@ -110,13 +110,13 @@ public class DeploymentOptions {
}
}
- public String getClusterType() {
- return clusterType;
+ public boolean isEmbedded() {
+ return embedded;
}
- public void setClusterType(String clusterType) {
- if (this.clusterType == null) {
- this.clusterType = clusterType;
+ public void setEmbedded(boolean embedded) {
+ if (this.embedded == null) {
+ this.embedded = embedded;
}
}
diff --git a/modules/common/cassandra-bundle/src/main/resources/cassandra.properties b/modules/common/cassandra-bundle/src/main/resources/cassandra.properties
index d2fc1e4..e20b8ae 100644
--- a/modules/common/cassandra-bundle/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-bundle/src/main/resources/cassandra.properties
@@ -5,4 +5,4 @@ rhq.cassandra.bundle.version=1.0
rhq.cassandra.cluster.dir=${rhq.rootDir}/cassandra
rhq.cassandra.cluster.num-nodes=2
rhq.cassandra.cluster.auto-deploy=true
-rhq.cassandra.cluster.type=embedded
+rhq.cassandra.cluster.is-embedded=true