Changeset 669 in tmcsimulator

Timestamp:

09/14/2022 05:38:06 PM (4 years ago)

Author:

jdalbey

Message:

Updates to bin scripts to make use of revised config files.

Location:

trunk/bin

Files:

• resetlogs_dev.bat (added)
• systemstart_dev_full_session.bat (modified) (2 diffs)
• systemstart_dev_practice_session.bat (modified) (1 diff)
• systemstart_systest.bat (modified) (1 diff)
• systemstart_systest.sh (modified) (1 diff)

trunk/bin/systemstart_dev_full_session.bat

@@ -2 +2 @@
 
 # Delete any existing CADcomments.log
-del ../webapps/dynamicdata/CADcomments.log
+del ..\webapps\dynamicdata\CADcomments.log
 
 REM Start the webserver
@@ -11 +11 @@
 REM Start the CAD server
 cd ..
-start java -DCONFIG_DIR=config/dev -jar deploy\CADserver.jar
+start java -jar deploy\CADserver.jar
 
 REM sleep for 5 seconds

trunk/bin/systemstart_dev_practice_session.bat

@@ -11 +11 @@
 REM Start the CAD server
 cd ..
-start java -DCONFIG_DIR=config/dev -DPROP_FILE=cad_server_practice.properties -jar deploy\CADserver.jar
+start java -DPROP_FILE=cad_server_practice.properties -jar deploy\CADserver.jar
 
 REM sleep for 5 seconds

trunk/bin/systemstart_systest.bat

@@ -8 +8 @@
 REM is available for the EInotebook.  
 cd ..
-copy /y scripts\system_test_script.xml webapps\dynamicdata\incident_script.xml
+REM copy /y scripts\system_test_script.xml webapps\dynamicdata\incident_script.xml
 
 REM Start the CAD server
 start java -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar
-
-REM sleep for 5 seconds
-TIMEOUT /T 5
+REM sleep for 3 seconds
+TIMEOUT /T 3
 
 REM Start the Simulation Manager
 start java -jar deploy/SimManager.jar system_test_script.xml
+REM sleep for 2 seconds
+TIMEOUT /T 2
 
+REM Start the unified logger
+start python deploy/unifiedlogger.zip
+REM sleep for 2 seconds
+TIMEOUT /T 2
+
+
+REM Launch a browser with our webapps
+"C:\Program Files\Mozilla Firefox\firefox.exe" localhost:80/einotebook  localhost:80/cptms localhost:80/unifiedlogmonitor.html

trunk/bin/systemstart_systest.sh

@@ -12 +12 @@
 java -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar &
 sleep 7
+python deploy/unifiedlogger.zip
+sleep 2
 java -jar deploy/SimManager.jar system_test_script.xml &
-# Manual step for now, until it's integrated into Sim Mgr
-#cp Scenarios/system_test_script.xml webapps/dynamicdata/incident_script.xml
 
 # Start a browser and run the web applications
-firefox localhost:8080/einotebook  localhost:8080/cptms 
-#localhost:8080/unifiedlogmonitor.html &
+firefox localhost:8080/einotebook  localhost:8080/cptms localhost:8080/unifiedlogmonitor.html &