BZ 1145683 - change if-stmt so it can work on solaris 10 - semantics …

…slightly change, but since we don't support JVMs lower than 1.6 that means that effectively this doesn't change functionality

(cherry picked from commit 096e104)

modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml

@@ -181,6 +181,8 @@
                 <move file="${project.build.outputDirectory}/cassandra/conf" todir="${cassandra.dir}"/>
                 <delete file="${cassandra.dir}/bin/cassandra"/>
                 <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/>
+                <delete file="${cassandra.dir}/bin/cassandra.in.sh"/>
+                <move file="${project.build.outputDirectory}/cassandra/bin/cassandra.in.sh" todir="${cassandra.dir}/bin"/>
                 <delete dir="${project.build.outputDirectory}/cassandra"/>
                 <delete dir="${cassandra.dir}/javadoc"/>
                 <delete file="${cassandra.dir}/conf/cassandra-env.sh"/>

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra.in.sh

@@ -0,0 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ "x$CASSANDRA_HOME" = "x" ]; then
+    CASSANDRA_HOME="`dirname "$0"`/.."
+fi
+
+# The directory where Cassandra's configs live (required)
+if [ "x$CASSANDRA_CONF" = "x" ]; then
+    CASSANDRA_CONF="$CASSANDRA_HOME/conf"
+fi
+
+# This can be the path to a jar file, or a directory containing the 
+# compiled classes. NOTE: This isn't needed by the startup script,
+# it's just used here in constructing the classpath.
+cassandra_bin="$CASSANDRA_HOME/build/classes/main"
+cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
+#cassandra_bin="$cassandra_home/build/cassandra.jar"
+
+# JAVA_HOME can optionally be set here
+#JAVA_HOME=/usr/local/jdk6
+
+# The java classpath (required)
+CLASSPATH="$CASSANDRA_CONF:$cassandra_bin"
+
+for jar in "$CASSANDRA_HOME"/lib/*.jar; do
+    CLASSPATH="$CLASSPATH:$jar"
+done
+
+# set JVM javaagent opts to avoid warnings/errors
+# RHQ modification for Solaris 10 support - see BZ 1145683
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" != "1.6.0" ] \
+      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
+then
+    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+fi