some security cleanup

edexOsgi/com.raytheon.uf.tools.cli/impl/capture

@@ -1,6 +1,6 @@
 #!/bin/bash
 # base path to save capture data to, will create subdirectory for each workstation
-basePath="/data/fxa/cave"
+basePath="/awips2/fxa/cave"
 
 edexGrepString="edex.run.mode="
 
@@ -15,9 +15,6 @@ JSTACK_ITERATIONS="15"
 RUN_JMAP="Y"
 RUN_QPID_STAT="Y"
 MOVE_ALL_HS_ERR_PID="Y"
-# For remote top you must have ssh keys setup to allow automatic login, otherwise password prompt will get sent to log file and script will never exit
-GRAB_REMOTE_TOP="Y"
-GRAB_REMOTE_VMSTAT="Y"
 GRAB_CAVE_AND_ALERTVIZ_LOGS="Y"
 GRAB_SCREENSHOT="Y"
 GRAB_CURRENT_QUERIES="Y"
@@ -72,12 +69,6 @@ usage() {
    echo -e "-screen {y/n}\t\tdefault [$GRAB_SCREENSHOT]"
    echo "  Screen print the current workstation (local user must be running capture)"
    echo
-   echo -e "-t {y/n}\t\tdefault [$GRAB_REMOTE_TOP]"
-   echo "  Captures top information from servers, auto login must be enabled"
-   echo
-   echo -e "-v {y/n}\t\tdefault [$GRAB_REMOTE_VMSTAT]"
-   echo "  Captures vmstat information from servers, auto login must be enabled"
-   echo
    echo -e "-V {y/n}\t\tdefault [$RUN_VERSIONS]"
    echo "  Grab version information"
    echo
@@ -422,8 +413,6 @@ while [ ! -z "$1" ]; do
       -Q) GRAB_CURRENT_QUERIES="$1"; shift 1;;
       -s) RUN_JSTACK="$1"; shift 1;;
       -screen) GRAB_SCREENSHOT="$1"; shift 1;;
-      -t) GRAB_REMOTE_TOP="$1"; shift 1;;
-      -v) GRAB_REMOTE_VMSTAT="$1"; shift 1;;
       -V) RUN_VERSIONS="$1"; shift 1;;
       -z) TGZ_OUTPUT="$1"; shift 1;;
       -quick) RUN_JMAP="N"; JSTACK_ITERATIONS=5;;
@@ -437,8 +426,6 @@ checkYes RUN_JMAP $RUN_JMAP
 checkYes RUN_QPID_STAT $RUN_QPID_STAT
 checkYes FORCE $FORCE
 checkYes MOVE_ALL_HS_ERR_PID $MOVE_ALL_HS_ERR_PID
-checkYes GRAB_REMOTE_TOP $GRAB_REMOTE_TOP
-checkYes GRAB_REMOTE_VMSTAT $GRAB_REMOTE_VMSTAT
 checkYes GRAB_CURRENT_QUERIES $GRAB_CURRENT_QUERIES
 checkYes GRAB_CAVE_AND_ALERTVIZ_LOGS $GRAB_CAVE_AND_ALERTVIZ_LOGS
 checkYes EDEX_MODE $EDEX_MODE
@@ -463,8 +450,6 @@ if [ "$EDEX_MODE" == "y" ]; then
    reason="n"
    GRAB_CAVE_AND_ALERTVIZ_LOGS="n"
    MOVE_ALL_HS_ERR_PID="n"
-   GRAB_REMOTE_TOP="n"
-   GRAB_REMOTE_VMSTAT="n"
    GRAB_XORG_LOG="n"
 fi
 

edexOsgi/deploy.edex.awips2/esb/conf/wrapper.conf

@@ -1,26 +1,6 @@
 #********************************************************************
-##
-# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
-# This software product contains export-restricted data whose
-# export/transfer/disclosure is restricted by U.S. law. Dissemination
-# to non-U.S. persons whether in the United States or abroad requires
-# an export license or other authorization.
-# 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
-# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
-# further licensing information.
-##
 # Wrapper Properties
 #********************************************************************
-
 wrapper.debug=false
 wrapper.java.debug.port=${EDEX_DEBUG_PORT}
 set.default.EDEX_HOME=../..
@@ -148,9 +128,6 @@ wrapper.java.additional.profile.1=${PROFILER_PARAM_1}
 # sets the user preferences file to be unique to this JVM
 wrapper.java.additional.prefs.1=-Djava.util.prefs.userRoot=${HOME}/.java/${HOSTNAME}-${EDEX_RUN_MODE}.userPrefs
 
-# Add option to override java.security settings if needed
-wrapper.java.additional.security.1=${JAVA_SECURITY_OPTION}
-
 # Initial Java Heap Size (in MB)
 wrapper.java.initmemory=${INIT_MEM}
 
@@ -169,9 +146,9 @@ wrapper.script.ABORT.timeout=120
 wrapper.script.RESTART=wrapperCapture.sh
 wrapper.script.RESTART.timeout=120
 
-# jvm will be hard killed after 5 minutes of trying to shutdown
+# jvm will be hard killed after 1 minute of trying to shutdown
 wrapper.jvm_exit.timeout=0
-wrapper.shutdown.timeout=300
+wrapper.shutdown.timeout=60
 
 #********************************************************************
 # Monitor the Application

tests/runTests.sh

@@ -13,4 +13,4 @@ fi
 export ANT_OPTS="-XX:PermSize=${INITIAL_PERMGEN_SIZE} -XX:MaxPermSize=${MAX_PERMGEN_SIZE}  $*"
 ant
 
-sudo rsync -rugl tmp/test-reports/html/* root@awipscm:/var/www/html/junit
+#sudo rsync -rugl tmp/test-reports/html/* root@awipscm:/var/www/html/junit