diff --git a/tomcat/bin/catalina.sh b/tomcat/bin/catalina.sh index a64984a..102fd4c 100755 --- a/tomcat/bin/catalina.sh +++ b/tomcat/bin/catalina.sh @@ -388,6 +388,7 @@ if [ "$1" = "debug" ] ; then -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ + -Dexem.agent.name=${oneagentname} -Dexem.receiver.addr=${oneagentaddr} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ -javaagent:/usr/local/exem/java/lib/exem-java-agent.jar \ org.apache.catalina.startup.Bootstrap "$@" start @@ -400,6 +401,7 @@ if [ "$1" = "debug" ] ; then -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ + -Dexem.agent.name=${oneagentname} -Dexem.receiver.addr=${oneagentaddr} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ -javaagent:/usr/local/exem/java/lib/exem-java-agent.jar \ org.apache.catalina.startup.Bootstrap "$@" start @@ -423,6 +425,7 @@ elif [ "$1" = "run" ]; then -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ + -Dexem.agent.name=${oneagentname} -Dexem.receiver.addr=${oneagentaddr} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ -javaagent:/usr/local/exem/java/lib/exem-java-agent.jar \ org.apache.catalina.startup.Bootstrap "$@" start @@ -434,6 +437,7 @@ elif [ "$1" = "run" ]; then -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ + -Dexem.agent.name=${oneagentname} -Dexem.receiver.addr=${oneagentaddr} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ -javaagent:/usr/local/exem/java/lib/exem-java-agent.jar \ org.apache.catalina.startup.Bootstrap "$@" start @@ -510,6 +514,7 @@ elif [ "$1" = "start" ] ; then -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ + -Dexem.agent.name=${oneagentname} -Dexem.receiver.addr=${oneagentaddr} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ -javaagent:/usr/local/exem/java/lib/exem-java-agent.jar \ org.apache.catalina.startup.Bootstrap "$@" start \ @@ -523,6 +528,7 @@ elif [ "$1" = "start" ] ; then -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ -Dintermax.agentname=${agentname} -Dintermax.agentservice=${agentservice} -Dintermax.agentgroup=${agentgroup} -Dintermax.hostgroup=apck2 -Dintermax.tier=${tier} \ + -Dexem.agent.name=${oneagentname} -Dexem.receiver.addr=${oneagentaddr} \ -javaagent:/usr/local/intermax/23.12.07.02/jspd/lib/jspd.jar \ -javaagent:/usr/local/exem/java/lib/exem-java-agent.jar \ org.apache.catalina.startup.Bootstrap "$@" start \