xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1862 - set_hydro_env now looks up db driver jar dynamically Peer review comments" into omaha_13.4.1

Browse source 
Former-commit-id: d1640829b9 [formerly df3a446c96] [formerly 04713029bf [formerly de28fa98b53242155213b7c66b54fe146166816d]]
Former-commit-id: 04713029bf
Former-commit-id: 09e0e0647a
This commit is contained in:
Lee Venable 2013-04-11 12:14:04 -05:00 • committed by Gerrit Code Review
commit 81a8d4bf28
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
View file

@ -71,12 +71,19 @@ export DAMCAT_DB_NAME=$(get_apps_defaults damcat_db_name)
export JDBCURL=jdbc:postgresql://$PGHOST:$PGPORT/$DB_NAME?user=$PGUSER export JDBCURL=jdbc:postgresql://$PGHOST:$PGPORT/$DB_NAME?user=$PGUSER
export DAMCREST_JDBCURL=jdbc:postgresql://$PGHOST:$PGPORT/$DAMCAT_DB_NAME?user=$PGUSER export DAMCREST_JDBCURL=jdbc:postgresql://$PGHOST:$PGPORT/$DAMCAT_DB_NAME?user=$PGUSER
PGSQL_DRIVER_JAR=postgresql-8.3-603.jdbc3.jar
if [ "${PGSQL_DRIVER_DIR}" = "" ]; then if [ "${PGSQL_DRIVER_DIR}" = "" ]; then
export DB_DRIVER_PATH=${EDEX_HOME}/lib/dependencies/org.postgres/${PGSQL_DRIVER_JAR} DB_DRIVER_DIR=${EDEX_HOME}/lib/dependencies/org.postgres
else else
export DB_DRIVER_PATH=${PGSQL_DRIVER_DIR}/${PGSQL_DRIVER_JAR} DB_DRIVER_DIR=${PGSQL_DRIVER_DIR}/
fi fi
cd $DB_DRIVER_DIR
files=$(find . | grep postgresql | grep jar)
for i in $files
do
echo $i
PGSQL_DRIVER_JAR=$i
done
export DB_DRIVER_PATH=${DB_DRIVER_DIR}/${PGSQL_DRIVER_JAR}
#=========================================================================== #===========================================================================
# This is stuff extracted from the original HYDRO_ENV # This is stuff extracted from the original HYDRO_ENV