Changeset 679 in tmcsimulator for trunk


Ignore:
Timestamp:
09/26/2022 05:03:29 PM (4 years ago)
Author:
jdalbey
Message:

Update scripts and bat files to use config/devlinux files.

Location:
trunk/bin
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/bin/CADclient.bat

    r384 r679  
    22 
    33cd .. 
    4 java -Djava.util.logging.config.file=config/cad_client_logging.properties -jar deploy/CADClient.jar  
     4java -Djava.util.logging.config.file=config/logging_cad_client.properties -jar deploy/CADClient.jar  
    55 
    66 

  • trunk/bin/postsession_logmerge.bat

    r675 r679  
    1212 
    1313REM 2. Define a variable for the directory containing the data files 
    14 set dir="webapps\dynamicdata" 
     14REM dir="webapps\dynamicdata" 
     15set dir="w:\webapps\dynamicdata" 
    1516 
    1617REM 3. Merge the unified log with cad details and evaluation ratings 
    … …  
    2223REM 4. Next, launch the webserver and browse to localhost:8080/sessionlogdisplay.html  
    2324REM    to show a nicely formatted version of the results. 
    24 "C:\Program Files\Mozilla Firefox\firefox.exe"  localhost:80/sessionlogdisplay.html  & 
    25  
     25"C:\Program Files (x86)\Mozilla Firefox\firefox.exe"  webapps.tmcsim/sessionlogdisplay.html  & 
     26REM "C:\Program Files (x86)\Mozilla Firefox\firefox.exe"  localhost:8080/sessionlogdisplay.html  & 

  • trunk/bin/systemstart_dev_full_session.sh

    r648 r679  
    11#!/bin/sh 
     2 
     3# Kill any process leftover from previous run 
     4kill $(ps  aux | grep "[p]ython -m CGIHTTPServer 8080" | awk '{print $2}') 
     5kill $(ps  aux | grep "[p]ython deploy/unifiedlogger.zip" | awk '{print $2}') 
     6 
     7# Get path to this script 
     8# $0 contains path to the script file, even if launched from file manager 
     9SCRIPT_PATH=$(dirname "$(readlink -f "$0")") 
     10# CD to the script folder 
     11cd "$SCRIPT_PATH" 
     12 
    213# Start the Simulator System with the full incident script 
    3  
    414cd ../webapps 
    515# Delete any existing CADcomments.log 
    … …  
    1020sleep 1 
    1121cd .. 
    12 java -jar deploy/CADserver.jar & 
     22java -DCONFIG_DIR=config/devlinux -jar deploy/CADserver.jar & 
    1323sleep 10 
    1424java -jar deploy/SimManager.jar full_script_2016.xml & 
    … …  
    2131 
    2232sleep 10 
    23 java -jar deploy/CADclient.jar & 
     33java -DCONFIG_DIR=config/devlinux -jar deploy/CADclient.jar & 
    2434sleep 5 
    2535 

  • trunk/bin/systemstart_dev_practice_session.sh

    r663 r679  
    1 #!/bin/sh 
     1#!/bin/bash 
     2 
     3# Kill any process leftover from previous run 
     4kill $(ps  aux | grep "[p]ython -m CGIHTTPServer 8080" | awk '{print $2}') 
     5kill $(ps  aux | grep "[p]ython deploy/unifiedlogger.zip" | awk '{print $2}') 
     6 
     7# Get path to this script 
     8# $0 contains path to the script file, even if launched from file manager 
     9SCRIPT_PATH=$(dirname "$(readlink -f "$0")") 
     10# CD to the script folder 
     11cd "$SCRIPT_PATH" 
     12 
    213# Start the Simulator System with the practice script 
    314cd ../webapps 
    … …  
    516sleep 1 
    617cd .. 
    7 java -DPROP_FILE=cad_server_practice.properties -jar deploy/CADserver.jar & 
     18java -DCONFIG_DIR=config/devlinux -DPROP_FILE=cad_server_practice.properties -jar deploy/CADserver.jar & 
    819sleep 7 
     20python deploy/unifiedlogger.zip & 
     21 
     22sleep 2 
    923java -jar deploy/SimManager.jar practice_script_2016.xml & 
    1024 
    11 # Start Unified Logger Service 
    12 python deploy/unifiedlogger.zip & 
    13 sleep 5 
    1425# Start a browser and run the web applications 
    1526firefox localhost:8080/einotebook  localhost:8080/cptms localhost:8080/unifiedlogmonitor.html & 

  • trunk/bin/systemstart_systest.bat

    r669 r679  
    2727 
    2828REM Launch a browser with our webapps 
    29 "C:\Program Files\Mozilla Firefox\firefox.exe" localhost:80/einotebook  localhost:80/cptms localhost:80/unifiedlogmonitor.html 
     29"C:\Program Files (x86)\Mozilla Firefox\firefox.exe" localhost:80/einotebook  localhost:80/cptms localhost:80/unifiedlogmonitor.html 

  • trunk/bin/systemstart_systest.sh

    r674 r679  
    1 #!/bin/sh 
     1#!/bin/bash 
    22 
    33# Kill any process leftover from previous run 
    44kill $(ps  aux | grep "[p]ython -m CGIHTTPServer 8080" | awk '{print $2}') 
    55kill $(ps  aux | grep "[p]ython deploy/unifiedlogger.zip" | awk '{print $2}') 
     6 
     7# Get path to this script 
     8# $0 contains path to the script file, even if launched from file manager 
     9SCRIPT_PATH=$(dirname "$(readlink -f "$0")") 
     10# CD to the script folder 
     11cd "$SCRIPT_PATH" 
    612 
    713# Start the Simulator System with the system test script 
    … …  
    1016sleep 1 
    1117cd .. 
    12 java -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar & 
     18java -DCONFIG_DIR=config/devlinux -DPROP_FILE=cad_server_systest.properties -jar deploy/CADserver.jar & 
    1319sleep 7 
    1420python deploy/unifiedlogger.zip & 
     21 
    1522sleep 2 
    1623java -jar deploy/SimManager.jar system_test_script.xml & 
    … …  
    1825# Start a browser and run the web applications 
    1926firefox localhost:8080/einotebook  localhost:8080/cptms localhost:8080/unifiedlogmonitor.html & 
     27 
Note: See TracChangeset for help on using the changeset viewer.