--- tomcat	2010-07-12 11:48:22.000000000 +0100
+++ tomcat-2	2010-07-12 12:31:00.000000000 +0100
@@ -147,11 +147,11 @@
 			>> "$TOMCAT_CONSOLE" 2>&1 &
 	else
 		su - -s /bin/sh "$RESOURCE_TOMCAT_USER" \
-			-c "export JAVA_HOME=${OCF_RESKEY_java_home};\n
-                            export JAVA_OPTS=-Dname=${TOMCAT_NAME};\n
-                            export CATALINA_HOME=${OCF_RESKEY_catalina_home};\n
-                            export CATALINA_PID=${OCF_RESKEY_catalina_pid};\n
-                            export CATALINA_OPTS=\"${OCF_RESKEY_catalina_opts}\";\n
+			-c "export JAVA_HOME=${OCF_RESKEY_java_home};\
+                            export JAVA_OPTS=-Dname=${TOMCAT_NAME};\
+                            export CATALINA_HOME=${OCF_RESKEY_catalina_home};\
+                            export CATALINA_PID=${OCF_RESKEY_catalina_pid};\
+                            export CATALINA_OPTS=\"${OCF_RESKEY_catalina_opts}\";\
                             $CATALINA_HOME/bin/catalina.sh start ${OCF_RESKEY_tomcat_start_opts}" \
 			>> "$TOMCAT_CONSOLE" 2>&1 &
 	fi
@@ -182,12 +182,12 @@
 		eval $tomcat_stop_cmd >> "$TOMCAT_CONSOLE" 2>&1
 	else
 		su - -s /bin/sh "$RESOURCE_TOMCAT_USER" \
-			-c "export JAVA_HOME=${OCF_RESKEY_java_home};\n
-                            export JAVA_OPTS=-Dname=${TOMCAT_NAME};\n
-                            export CATALINA_HOME=${OCF_RESKEY_catalina_home};\n
-                            export CATALINA_PID=${OCF_RESKEY_catalina_pid};\n
+			-c "export JAVA_HOME=${OCF_RESKEY_java_home};\
+                            export JAVA_OPTS=-Dname=${TOMCAT_NAME};\
+                            export CATALINA_HOME=${OCF_RESKEY_catalina_home};\
+                            export CATALINA_PID=${OCF_RESKEY_catalina_pid};\
                             $CATALINA_HOME/bin/catalina.sh stop" \
-			>> "$TOMCAT_CONSOLE" 2>&1
+			>> "$TOMCAT_CONSOLE" 2>&1 &
 	fi
 
 	lapse_sec=0