patch for windows

scouter-project · Dec 26, 2015 · 98fda34 · 98fda34
1 parent 9e77796
commit 98fda34
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 24 deletions.
diff --git a/demo-env1/apache-tomcat-7.0.67/bin/catalina.bat b/demo-env1/apache-tomcat-7.0.67/bin/catalina.bat
@@ -185,8 +185,8 @@ set "JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%"
 
 rem ###### SCOUTER OPTIONS ###########################################################
 if "%1"=="stop" goto skip_agent
-set JAVA_OPTS=%JAVA_OPTS% -javaagent:%CATALINA_HOME%/../scouter/agent.java/scouter.agent.jar
-set JAVA_OPTS=%JAVA_OPTS% -Dscouter.config=%CATALINA_HOME%/../confmyTomcat1.conf
+set JAVA_OPTS=%JAVA_OPTS% -javaagent:%CATALINA_HOME%\..\scouter\agent.java\scouter.agent.jar
+set JAVA_OPTS=%JAVA_OPTS% -Dscouter.config=%CATALINA_HOME%\..\conf\myTomcat1.conf
 rem set JAVA_OPTS=%JAVA_OPTS% -Dnet_collector_ip=127.0.0.1
 
 :skip_agent

diff --git a/demo-env1/start-jmeter.bat b/demo-env1/start-jmeter.bat
@@ -1,4 +1,6 @@
-cd ./jmeter/bin
-./jmeter.bat -n -t scouter-demo1.jmx
-cd ../..
-
+@echo off
+setlocal
+set originDir=%cd%
+cd /D %~dp0
+start cmd /C jmeter\bin\jmeter.bat -n -t jmeter\bin\scouter-demo1.jmx
+cd /D %originDir%
diff --git a/demo-env1/start-scouter-host.bat b/demo-env1/start-scouter-host.bat
@@ -1,3 +1,6 @@
-cd ./scouter/agent.host
-host.bat
-cd ../..
+@echo off
+setlocal
+set originDir=%cd%
+cd /D %~dp0
+start cmd /C scouter\agent.host\host.bat
+cd /D %originDir%
diff --git a/demo-env1/start-scouter-server.bat b/demo-env1/start-scouter-server.bat
@@ -1,3 +1,6 @@
-cd ./scouter/server
-startup.bat
-cd ../..
+@echo off
+setlocal
+set originDir=%cd%
+cd /D %~dp0
+start cmd /C scouter\server\startup.bat
+cd /D %originDir%
diff --git a/demo-env1/start-tomcat.bat b/demo-env1/start-tomcat.bat
@@ -1,3 +1,8 @@
-cd ./apache-tomcat-7.0.67/bin
-./startup.bat
-cd ../..
+@echo off
+setlocal
+set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_25
+set originDir=%cd%
+cd /D %~dp0
+cd apache-tomcat-7.0.67\bin
+startup.bat
+cd /D %originDir%
diff --git a/demo-env1/stop-scouter-host.bat b/demo-env1/stop-scouter-host.bat
@@ -1,3 +1,6 @@
-cd ./scouter/agent.host
-stop.bat
-cd ../..
+@echo off
+setlocal
+set originDir=%cd%
+cd /D %~dp0
+start cmd /C scouter\agent.host\stop.bat
+cd /D %originDir%
diff --git a/demo-env1/stop-scouter-server.bat b/demo-env1/stop-scouter-server.bat
@@ -1,3 +1,5 @@
-cd ./scouter/server
-stop.bat
-cd ../..
+@echo off
+setlocal
+set originDir=%cd%
+start cmd /C scouter\server\stop.bat
+cd /D %originDir%
diff --git a/demo-env1/stop-tomcat.bat b/demo-env1/stop-tomcat.bat
@@ -1,3 +1,7 @@
-cd ./apache-tomcat-7.0.67/bin
-./shutdown.bat
-cd ../..
+@echo off
+setlocal
+set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_25
+cd /D %~dp0
+cd apache-tomcat-7.0.67\bin
+shutdown.bat
+cd /D %originDir%