diff --git a/rgmanager/src/resources/tomcat-6.sh b/rgmanager/src/resources/tomcat-6.sh
index c9513b267..bc9059df2 100644
--- a/rgmanager/src/resources/tomcat-6.sh
+++ b/rgmanager/src/resources/tomcat-6.sh
@@ -1,240 +1,248 @@
 #!/bin/bash
 #
 # Copyright (C) 1997-2003 Sistina Software, Inc.  All rights reserved.
 # Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
 export LC_ALL=C
 export LANG=C
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 . $(dirname $0)/ocf-shellfuncs
 . $(dirname $0)/utils/config-utils.sh
 . $(dirname $0)/utils/messages.sh
 . $(dirname $0)/utils/ra-skelet.sh
 
 declare TOMCAT_pid_file="`generate_name_for_pid_file`"
 declare TOMCAT_conf_dir="`generate_name_for_conf_dir`/conf"
 declare TOMCAT_gen_config_file="$TOMCAT_conf_dir/server.xml"
 declare TOMCAT_gen_catalina_base="`generate_name_for_conf_dir`"
 
 declare CATALINA_HOME
 declare CATALINA_BASE
 declare CATALINA_TMPDIR
 declare CLASSPATH
 declare TOMCAT_USER
 ##
 
 verify_all()
 {
 	clog_service_verify $CLOG_INIT
 
 	if [ -z "$OCF_RESKEY_name" ]; then
 		clog_service_verify $CLOG_FAILED "Invalid Name Of Service"
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ -z "$OCF_RESKEY_service_name" ]; then
 		clog_service_verify $CLOG_FAILED_NOT_CHILD
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ -z "$OCF_RESKEY_config_file" ]; then
 		clog_check_file_exist $CLOG_FAILED_INVALID "$OCF_RESKEY_config_file"
 		clog_service_verify $CLOG_FAILED
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ ! -r "$OCF_RESKEY_config_file" ]; then
 		clog_check_file_exist $CLOG_FAILED_NOT_READABLE $OCF_RESKEY_config_file
 		clog_service_verify $CLOG_FAILED
 		return $OCF_ERR_ARGS
 	fi
 
 	. "$OCF_RESKEY_config_file"
 
 	if [ $? -ne 0 ]; then
 		clog_service_verify $CLOG_FAILED "Error In The File \"$OCF_RESKEY_config_file\""
 		return $OCF_ERR_ARGS
 	fi 
 
 	if [ -z "$CATALINA_HOME" ]; then
 		clog_service_verify $CLOG_FAILED "CATALINA_HOME Not Specified In ${OCF_RESKEY_config_file}"
 		return $OCF_ERR_ARGS;
 	fi	
 
 	if [ ! -d "$CATALINA_HOME" ]; then
 		clog_service_verify $CLOG_FAILED "CATALINA_HOME Does Not Exist"
 		return $OCF_ERR_ARGS;
 	fi
 
 	if [ -z "$CATALINA_TMPDIR" ]; then
 		clog_service_verify $CLOG_FAILED "CATALINA_TMPDIR Not Specified In ${OCF_RESKEY_config_file}"
 		return $OCF_ERR_ARGS;
 	fi	
 
 	if [ ! -d "$CATALINA_TMPDIR" ]; then
 		clog_service_verify $CLOG_FAILED "CATALINA_TMPDIR Does Not Exist"
 		return $OCF_ERR_ARGS;
 	fi
 
 	if [ -z "$TOMCAT_USER" ]; then
 		clog_service_verify $CLOG_FAILED "TOMCAT_USER Does Not Exist"
 		return $OCF_ERR_ARGS;
 	fi
 
 	clog_service_verify $CLOG_SUCCEED
 		
 	return 0
 }
 
 generate_config_file()
 {
 	declare original_file="$1"
 	declare generated_file="$2"
 	declare ip_addresses="$3"
 
 	if [ -f "$generated_file" ]; then
 		sha1_verify "$generated_file"
 		if [ $? -ne 0 ]; then
 			clog_check_sha1 $CLOG_FAILED
 			return 0
 		fi
 	fi	
 
 	clog_generate_config $CLOG_INIT "$original_file" "$generated_file"
 
 	$(dirname $0)/utils/tomcat-parse-config.pl $ip_addresses < "$original_file" > "$generated_file"
 
         sha1_addToFile "$generated_file"
 	clog_generate_config $CLOG_SUCCEED "$original_file" "$generated_file"
                
 	return 0;
 }
 
 start()
 {
 	clog_service_start $CLOG_INIT
 
 	create_pid_directory
 	create_conf_directory "$TOMCAT_conf_dir"
 	check_pid_file "$TOMCAT_pid_file"
 
 	if [ $? -ne 0 ]; then
 		clog_check_pid $CLOG_FAILED "$TOMCAT_pid_file"
 		clog_service_start $CLOG_FAILED
 		return $OCF_ERR_GENERIC
 	fi
 	clog_looking_for $CLOG_INIT "IP Addresses"
 
         get_service_ip_keys "$OCF_RESKEY_service_name"
         ip_addresses=`build_ip_list`
 
 	if [ -z "$ip_addresses" ]; then
 		clog_looking_for $CLOG_FAILED_NOT_FOUND "IP Addresses"
 		return $OCF_ERR_GENERIC
 	fi
 	
 	clog_looking_for $CLOG_SUCCEED "IP Addresses"
 
 	. "$OCF_RESKEY_config_file"
 
 	generate_config_file "$CATALINA_BASE/conf/server.xml" "$TOMCAT_gen_config_file" "$ip_addresses"
 	rm -f "$TOMCAT_gen_catalina_base/conf/tomcat6.conf"
 	( cat $OCF_RESKEY_config_file | grep -v 'CATALINA_PID=' | grep -v 'CATALINA_BASE='; echo CATALINA_BASE="$TOMCAT_gen_catalina_base"; echo CATALINA_PID="$TOMCAT_pid_file") > "$TOMCAT_gen_catalina_base/conf/tomcat6.conf" 
 	ln -s "$CATALINA_BASE"/* "$TOMCAT_gen_catalina_base" &> /dev/null
 	ln -s "$CATALINA_BASE"/conf/* "$TOMCAT_gen_catalina_base"/conf &> /dev/null
 	
 	export TOMCAT_CFG="$TOMCAT_gen_catalina_base/conf/tomcat6.conf"
+
+	tomcat6_options="$tomcat6_options $(
+				 awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \
+				 $TOMCAT_CFG
+			 )"
+
+	eval "$tomcat6_options"
+
 	/usr/sbin/tomcat6 start
 
 	if [ $? -ne 0 ]; then
 		clog_service_start $CLOG_FAILED
 		return $OCF_ERR_GENERIC
 	fi
 
 	clog_service_start $CLOG_SUCCEED
 
 	return 0;
 }
 
 stop()
 {
 	clog_service_stop $CLOG_INIT
 
 	stop_generic "$TOMCAT_pid_file" "$OCF_RESKEY_shutdown_wait"
 	
 	if [ $? -ne 0 ]; then
 		clog_service_stop $CLOG_FAILED
 		return $OCF_ERR_GENERIC
 	fi
 
         if [ -e "$TOMCAT_pid_file" ]; then
 		rm -f "$TOMCAT_pid_file"
 	fi
                                 
 	clog_service_stop $CLOG_SUCCEED
 	return 0;
 }
 
 status()
 {
 	clog_service_status $CLOG_INIT
 
 	status_check_pid "$TOMCAT_pid_file"
 	if [ $? -ne 0 ]; then
 		clog_service_status $CLOG_FAILED "$TOMCAT_pid_file"
 		return $OCF_ERR_GENERIC
 	fi
 
 	clog_service_status $CLOG_SUCCEED
 	return 0
 }
 
 case $1 in
 	meta-data)
 		cat `echo $0 | sed 's/^\(.*\)\.sh$/\1.metadata/'`
 		exit 0
 		;;
 	validate-all)
 		verify_all
 		exit $?
 		;;
 	start)
 		verify_all && start
 		exit $?
 		;;
 	stop)
 		verify_all && stop
 		exit $?
 		;;
 	status|monitor)
 		verify_all
 		status
 		exit $?
 		;;
 	restart)
 		verify_all
 		stop
 		start
 		exit $?
 		;;
 	*)
 		echo "Usage: $0 {start|stop|status|monitor|restart|meta-data|validate-all}"
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
diff --git a/rgmanager/src/resources/utils/config-utils.sh b/rgmanager/src/resources/utils/config-utils.sh
index 55e60a645..64b184783 100644
--- a/rgmanager/src/resources/utils/config-utils.sh
+++ b/rgmanager/src/resources/utils/config-utils.sh
@@ -1,283 +1,283 @@
 #!/bin/bash
 #
 # Copyright (C) 1997-2003 Sistina Software, Inc.  All rights reserved.
 # Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
 declare RA_COMMON_pid_dir=/var/run/cluster
 declare RA_COMMON_conf_dir=/etc/cluster
 
 declare -i FAIL=255
 declare -a ip_keys
 
 generate_configTemplate()
 {
 	cat > "$1" << EOT
 #
 # "$1" was created from the "$2"
 #
 # This template configuration was automatically generated, and will be
 # automatically regenerated if removed. Once this file has been altered,
 # automatic re-generation will stop. Remember to copy this file to all 
 # other cluster members after making changes, or your service will not 
 # operate correctly.
 #
 EOT
 }
 
 generate_configTemplateXML()
 {
 	cat > "$1" << EOT
 <!--
   "$1" was created from the "$2"
 
   This template configuration was automatically generated, and will be
   automatically regenerated if removed. Once this file has been altered,
   automatic re-generation will stop. Remember to copy this file to all 
   other cluster members after making changes, or your service will not 
   operate correctly.
 -->
 EOT
 }
 
 sha1_addToFile()
 {
         declare sha1line="# rgmanager-sha1 $(sha1sum "$1")"
         echo $sha1line >> "$1"
 }
 
 sha1_addToFileXML()
 {
         declare sha1line="<!--# rgmanager-sha1 $(sha1sum "$1")-->"
         echo $sha1line >> "$1"
 }
 
 sha1_verify()
 {
 	declare sha1_new sha1_old
 	declare oldFile=$1
 
 	ocf_log debug "Checking: SHA1 checksum of config file $oldFile"
 
 	sha1_new=`cat "$oldFile" | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
  	sha1_old=`tail -n 1 "$oldFile" | sed 's/^\(<!--\)\?# rgmanager-sha1 \(.*\)$/\2/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
 
 	if [ "$sha1_new" = "$sha1_old" ]; then
 	        ocf_log debug "Checking: SHA1 checksum > succeed"
 		return 0;
 	else
 		ocf_log debug "Checking: SHA1 checksum > failed - file changed"
 		return 1;
 	fi
 }
 
 #
 # Usage: ccs_get key
 #
 ccs_get()
 {
 	declare outp
 	declare key
 
 	[ -n "$1" ] || return $FAIL
 
 	key="$*"
 
 	outp=$(ccs_tool query "$key" 2>&1)
 	if [ $? -ne 0 ]; then
 		if [[ "$outp" =~ "Query failed: Invalid argument" ]]; then
 			# This usually means that element does not exist
 			# e.g. when checking for IP address 
 			return 0;
 		fi
 
 		if [ "$outp" = "${outp/No data available/}" ] || [ "$outp" = "${outp/Operation not permitted/}" ]; then
 			ocf_log err "$outp ($key)"
 			return $FAIL
 		fi
 
 		# no real error, just no data available
 		return 0
 	fi
 
 	echo $outp
 
 	return 0
 }
 
 #
 # Build a list of service IP keys; traverse refs if necessary
 # Usage: get_service_ip_keys desc serviceName
 #
 get_service_ip_keys()
 {
 	declare svc=$1
 	declare -i x y=0
 	declare outp
 	declare key
 
 	#
 	# Find service-local IP keys
 	#
 	x=1
 	while : ; do
 		key="/cluster/rm/service[@name=\"$svc\"]/ip[$x]"
 
 		#
 		# Try direct method
 		#
 		outp=$(ccs_get "$key/@address")
 		if [ $? -ne 0 ]; then
 			return 1
 		fi
 
 		#
 		# Try by reference
 		#
 		if [ -z "$outp" ]; then
 			outp=$(ccs_get "$key/@ref")
 			if [ $? -ne 0 ]; then
 				return 1
 			fi
 			key="/cluster/rm/resources/ip[@address=\"$outp\"]"
 		fi
 
 		if [ -z "$outp" ]; then
 			break
 		fi
 
 		#ocf_log debug "IP $outp found @ $key"
 
 		ip_keys[$y]="$key"
 
 		((y++))
 		((x++))
 	done
 
 	ocf_log debug "$y IP addresses found for $svc/$OCF_RESKEY_name"
 
 	return 0
 }
 
 build_ip_list()
 {
         declare ipaddrs ipaddr
         declare -i x=0
                         
         while [ -n "${ip_keys[$x]}" ]; do
               ipaddr=$(ccs_get "${ip_keys[$x]}/@address")
               if [ -z "$ipaddr" ]; then
                                    break
               fi
 
 	      # remove netmask
 	      iponly=`echo $ipaddr | sed 's/\/.*//'`
               ipaddrs="$ipaddrs $iponly"
              ((x++))
         done
 
         echo $ipaddrs
 }
 
 generate_name_for_pid_file()
 {
 	declare filename=$(basename $0)
 	
 	echo "$RA_COMMON_pid_dir/$(basename $0 | sed 's/^\(.*\)\..*/\1/')/$OCF_RESOURCE_INSTANCE.pid"
 	
 	return 0;
 }
 
 generate_name_for_pid_dir()
 {
 	declare filename=$(basename $0)
 	
 	echo "$RA_COMMON_pid_dir/$(basename $0 | sed 's/^\(.*\)\..*/\1/')/$OCF_RESOURCE_INSTANCE"
 	
 	return 0;
 }
 
 generate_name_for_conf_dir()
 {
 	declare filename=$(basename $0)
 
 	echo "$RA_COMMON_conf_dir/$(basename $0 | sed 's/^\(.*\)\..*/\1/')/$OCF_RESOURCE_INSTANCE"
 	
 	return 0;
 }
 
 create_pid_directory()
 {
 	declare program_name="$(basename $0 | sed 's/^\(.*\)\..*/\1/')"
 	declare dirname="$RA_COMMON_pid_dir/$program_name"
 
 	if [ -d "$dirname" ]; then
 		return 0;
 	fi
 	
 	chmod 711 "$RA_COMMON_pid_dir"
 	mkdir -p "$dirname"
 	
 	if [ "$program_name" = "mysql" ]; then
 		chown mysql.root "$dirname"
-	elif [ "$program_name" = "tomcat-5" ]; then
+	elif [ "$program_name" = "tomcat-5" -o "$program_name" = "tomcat-6" ]; then
 		chown tomcat.root "$dirname"
 	fi
 
 	return 0;
 }
 
 create_conf_directory()
 {
 	declare dirname="$1"
 
 	if [ -d "$dirname" ]; then
 		return 0;
 	fi
 	
 	mkdir -p "$dirname"
 	
 	return 0;
 }
 
 check_pid_file() {
 	declare pid_file="$1"
 
 	if [ -z "$pid_file" ]; then
 		return 1;
 	fi
 
 	if [ ! -e "$pid_file" ]; then
 		return 0;
 	fi
 
 	## if PID file is empty then it should be safe to remove it
 	read pid < "$pid_file"
 	if [ -z "$pid" ]; then
 		rm $pid_file
 		ocf_log debug "PID File \"$pid_file\" Was Removed - Zero length";
 		return 0;
 	fi
 
 	if [ ! -d /proc/`cat "$pid_file"` ]; then	
 		rm "$pid_file"
 		ocf_log debug "PID File \"$pid_file\" Was Removed - PID Does Not Exist";
 		return 0;
 	fi
 
 	return 1;
 }