modules/common/cassandra-common/src/main/resources/cassandra.properties | 28 +++++++++- modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 28 ++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-)
New commits: commit 478338738f47ec2a4c0b919c031a3b888bd97b1c Author: John Sanda jsanda@redhat.com Date: Wed Oct 24 21:16:08 2012 -0400
Include cassandra related properties in rhq-server.properties in dev builds
The container build script has been updated so that rhq-server.properties will include properties that affect embedded cluster deployments. This only happens when the dev profile is active during the build.
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra.properties b/modules/common/cassandra-common/src/main/resources/cassandra.properties index 35015bf..a5d1083 100644 --- a/modules/common/cassandra-common/src/main/resources/cassandra.properties +++ b/modules/common/cassandra-common/src/main/resources/cassandra.properties @@ -1,10 +1,34 @@ +# These properties are used for the Cassandra bundle deployment and for embedded cluster +# deployments. Properties that affect embedded cluster deployments are used only in +# development and test environments, not production environments. + rhq.cassandra.bundle.filename=/cassandra-bundle.zip rhq.cassandra.bundle.name=RHQ Cassandra Bundle rhq.cassandra.bundle.version=1.0
+# The remaining properties pertain to cluster configuration and are only used in +# development and testing environments when an embedded cluster is used. These properties +# are also loaded into the container build (when the dev profile is active) in the +# rhq-container.build.xml script. If you add any properties below here that pertain to +# cluster configuration for an embedded cluster, please also update +# rhq-container.build.xml. This is done as a convenience for developers so that they can +# just update rhq-server.properties to change the cluster configuration. +# +# +# Accepts a value of true or false and specifies whether or not the cluster is embedded. +# Note that if this property is set to false, the other, remaining cluster configuration +# properties that are set will be ignored as they are only used with embedded clusters. +rhq.cassandra.cluster.is-embedded=true + +# The directory in which cluster nodes will be installed. rhq.cassandra.cluster.dir=${rhq.rootDir}/cassandra + +# The number of nodes in the cluster. This specifies how many nodes to install and +# configure. The top level or base directory for each node will be nodeN where N is the +# node number. rhq.cassandra.cluster.num-nodes=2 + rhq.cassandra.cluster.auto-deploy=true -rhq.cassandra.cluster.auto-start=true -rhq.cassandra.cluster.is-embedded=true + +# The log4j logging level to use on each node. rhq.cassandra.logging.level=DEBUG diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 1da4a9a..b1944a7 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -587,6 +587,34 @@ rhq.autoinstall.public-endpoint-address= </copy> <echo>Putting a developer setting in rhq-server.properties to turn on/off strict agent update version checking</echo> <echo file="${project.build.outputDirectory}/bin/rhq-server.properties" append="true">rhq.server.agent-update.nonstrict-version-check=true</echo> + <loadproperties> + <zipentry zipfile="${settings.localRepository}/org/rhq/rhq-cassandra-common/${project.version}/rhq-cassandra-common-${project.version}.jar" + name="cassandra.properties"/> + </loadproperties> + <echo file="${project.build.outputDirectory}/bin/rhq-server.properties" append="true"> + +# The following properties that begin with a prefix of rhq.cassandra are ONLY for +# development/testing environments where an embedded cluster is used. These properties are +# loaded from the cassandra.properties file in the rhq-cassandra-common module. Note that +# the properties file is loaded from the artifact in the local maven repo, not from the +# module directory in the source tree. +# +# Accepts a value of true or false and specifies whether or not the cluster is embedded. +# Note that if this property is set to false, any of the following rhq.cassandra.* +# properties that are set will be ignored as they are only used with embedded clusters. +# rhq.cassandra.cluster.is-embedded=${rhq.cassandra.cluster.is-embedded} +# +# The directory in which cluster nodes will be installed. +# rhq.cassandra.cluster.dir=${rhq.cassandra.cluster.dir} +# +# The number of nodes in the cluster. This specifies how many nodes to install and +# configure. The top level or base directory for each node will be nodeN where N is the +# node number. +# rhq.cassandra.cluster.num-nodes=${rhq.cassandra.cluster.num-nodes} +# +# The log4j logging level to use on each node. +# rhq.cassandra.logging.level=${rhq.cassandra.logging.level} + </echo> </target>
<!-- The prepare-release target must be run AFTER the resources:resources goal has executed. -->
rhq-commits@lists.fedorahosted.org