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

Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.

Browse source 
Former-commit-id: 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly c0db02e377 [formerly b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]]
Former-commit-id: c0db02e377
Former-commit-id: 1397ac4ae6 [formerly 733b34202f] [formerly b02340a5b6e6f0e27447ad5a1f532ed0a3b37d18 [formerly d92eb0c227]]
Former-commit-id: a5cf683e790b615a5bad87dc4f842fa91d4710a1 [formerly 2b48d12f7c]
Former-commit-id: 89a427c142
This commit is contained in:
Bryan Kowal 2012-06-05 16:55:52 -05:00
parent b5707264ae
commit a2edb47d13
15 changed files with 99 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
javaUtilities/com.raytheon.wes2bridge.common/src/com/raytheon/wes2bridge/common/configuration/Wes2BridgeConfiguration.java
View file

@ -67,7 +67,7 @@ public class Wes2BridgeConfiguration
{ {
ConfigurationException exception = ConfigurationException exception =
new ConfigurationException( new ConfigurationException(
"The Wes2Bridge name cannot contain spaces."); "The Edex Environment name cannot contain spaces.");
exception.fillInStackTrace(); exception.fillInStackTrace();
throw exception; throw exception;

6
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
View file

@ -29,9 +29,9 @@ public class Wes2BridgeManager
private static final String AWIPSII = private static final String AWIPSII =
"/awips2"; "/awips2";
private static final String AWIPSII_WES2BRIDGE_SCRIPTS = private static final String AWIPSII_WES2BRIDGE_SCRIPTS =
AWIPSII + "/wes2bridge/scripts"; AWIPSII + "/edex-environment/scripts";
private static final String WES2BRIDGE_DIRECTORY = private static final String WES2BRIDGE_DIRECTORY =
"/usr/local/wes2bridge"; "/usr/local/edex-environment";
private Wes2BridgeConfiguration configuration = null; private Wes2BridgeConfiguration configuration = null;
private String wes2BridgeScripts = null; private String wes2BridgeScripts = null;
@ -104,7 +104,7 @@ public class Wes2BridgeManager
configuration.init(); configuration.init();
this.wes2BridgeScripts = WES2BRIDGE_DIRECTORY + "/" + this.wes2BridgeScripts = WES2BRIDGE_DIRECTORY + "/" +
configuration.getTestCaseName() + "/" + configuration.getTestCaseName() + "/" +
"wes2bridge"; "edex-environment";
} }
/* /*

74
rpms/awips2.wes2bridge/edex/component.spec → rpms/awips2.edex-environment/edex/component.spec
View file

@ -1,9 +1,9 @@
%define _installation_directory "/awips2" %define _installation_directory "/awips2"
# #
# awips2-wes2bridge-edex # awips2-edex-environment
# #
Name: awips2-wes2bridge-edex Name: awips2-edex-environment
Summary: awips2-wes2bridge-edex Summary: awips2-edex-environment
Version: %{_component_version} Version: %{_component_version}
Release: %{_component_release} Release: %{_component_release}
Group: AWIPSII Group: AWIPSII
@ -15,7 +15,7 @@ Vendor: Raytheon
Packager: Bryan Kowal Packager: Bryan Kowal
AutoReq: no AutoReq: no
provides: awips2-wes2bridge-edex provides: awips2-edex-environment
provides: awips2-edex-base provides: awips2-edex-base
provides: awips2-base-component provides: awips2-base-component
provides: awips2-edex-gfe provides: awips2-edex-gfe
@ -43,10 +43,10 @@ conflicts: awips2-edex-ncep
conflicts: awips2-edex-core conflicts: awips2-edex-core
%description %description
The wes2bridge version of awips2-edex consists of the edex runtime and The edex environment version of awips2-edex consists of the edex runtime and
the AWIPS II wes2bridge manager. The wes2bridge manager exists to spawn the AWIPS II edex-environment manager. The edex-environment manager exists to spawn
and configure additional instances of the wes2bridge triad {postgresql, and configure additional instances of the AWIPS II processing triad {postgresql,
qpid, edex}. The wes2bridge version of awips2-edex is not designed to qpid, edex}. The edex environment version of awips2-edex is not designed to
be run in the same way that the standard awips2-edex is. be run in the same way that the standard awips2-edex is.
# Disable byte-compiling of python and repacking of jar files. # Disable byte-compiling of python and repacking of jar files.
@ -89,15 +89,15 @@ mkdir -p %{_build_root}%{_installation_directory}/edex
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
mkdir -p %{_build_root}%{_installation_directory}/wes2bridge/scripts mkdir -p %{_build_root}%{_installation_directory}/edex-environment/scripts
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
mkdir -p %{_build_root}%{_installation_directory}/wes2bridge/macro/utilities mkdir -p %{_build_root}%{_installation_directory}/edex-environment/macro/utilities
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
mkdir -p %{_build_root}%{_installation_directory}/wes2bridge/macro/functions mkdir -p %{_build_root}%{_installation_directory}/edex-environment/macro/functions
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
@ -107,7 +107,7 @@ if [ $? -ne 0 ]; then
fi fi
# create the edex environment directory. # create the edex environment directory.
mkdir -p %{_build_root}/usr/local/wes2bridge mkdir -p %{_build_root}/usr/local/edex-environment
%build %build
# build edex # build edex
@ -121,7 +121,7 @@ if [ $? -ne 0 ]; then
fi fi
popd > /dev/null 2>&1 popd > /dev/null 2>&1
# build the wes2bridge utilities # build the edex-environment utilities
pushd . > /dev/null 2>&1 pushd . > /dev/null 2>&1
# Run the pde build. # Run the pde build.
cd %{_baseline_workspace}/build.wes2bridge.utility cd %{_baseline_workspace}/build.wes2bridge.utility
@ -152,7 +152,7 @@ popd > /dev/null 2>&1
# "install" the wes2bridge utilities # "install" the wes2bridge utilities
cd %{_baseline_workspace}/com.raytheon.wes2bridge.configuration cd %{_baseline_workspace}/com.raytheon.wes2bridge.configuration
/awips2/ant/bin/ant -f build.xml \ /awips2/ant/bin/ant -f build.xml \
-Ddestination.directory=%{_build_root}%{_installation_directory}/wes2bridge/macro/utilities \ -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
-Declipse.directory=%{_uframe_eclipse} \ -Declipse.directory=%{_uframe_eclipse} \
-Drpm.build=true -Drpm.build=true
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -160,7 +160,7 @@ if [ $? -ne 0 ]; then
fi fi
cd %{_baseline_workspace}/com.raytheon.wes2bridge.datalink cd %{_baseline_workspace}/com.raytheon.wes2bridge.datalink
/awips2/ant/bin/ant -f build.xml \ /awips2/ant/bin/ant -f build.xml \
-Ddestination.directory=%{_build_root}%{_installation_directory}/wes2bridge/macro/utilities \ -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
-Declipse.directory=%{_uframe_eclipse} \ -Declipse.directory=%{_uframe_eclipse} \
-Drpm.build=true -Drpm.build=true
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -168,7 +168,7 @@ if [ $? -ne 0 ]; then
fi fi
cd %{_baseline_workspace}/com.raytheon.wes2bridge.manager cd %{_baseline_workspace}/com.raytheon.wes2bridge.manager
/awips2/ant/bin/ant -f build.xml \ /awips2/ant/bin/ant -f build.xml \
-Ddestination.directory=%{_build_root}%{_installation_directory}/wes2bridge/macro/utilities \ -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
-Declipse.directory=%{_uframe_eclipse} \ -Declipse.directory=%{_uframe_eclipse} \
-Drpm.build=true -Drpm.build=true
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -183,37 +183,37 @@ EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex-base/scripts/init.d/edex_c
# Copy the startup scripts. # Copy the startup scripts.
cp ${POSTGRES_INITD} \ cp ${POSTGRES_INITD} \
%{_build_root}%{_installation_directory}/wes2bridge/scripts %{_build_root}%{_installation_directory}/edex-environment/scripts
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
cp ${QPID_INITD} \ cp ${QPID_INITD} \
%{_build_root}%{_installation_directory}/wes2bridge/scripts %{_build_root}%{_installation_directory}/edex-environment/scripts
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
cp ${QUEUE_SH} \ cp ${QUEUE_SH} \
%{_build_root}%{_installation_directory}/wes2bridge/scripts %{_build_root}%{_installation_directory}/edex-environment/scripts
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
cp ${EDEX_INITD} \ cp ${EDEX_INITD} \
%{_build_root}%{_installation_directory}/wes2bridge/scripts %{_build_root}%{_installation_directory}/edex-environment/scripts
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
# Copy the wes2bridge macro, functions, and utilities. # Copy the edex-environment macro, functions, and utilities.
DELIVERABLES="%{_baseline_workspace}/Installer.rpm/awips2.wes2bridge/wes2bridge.files/deliverables" DELIVERABLES="%{_baseline_workspace}/Installer.rpm/awips2.edex-environment/wes2bridge.files/deliverables"
# Macro and functions. # Macro and functions.
cp ${DELIVERABLES}/scripts/wes2bridge \ cp ${DELIVERABLES}/scripts/edex-environment \
%{_build_root}%{_installation_directory}/wes2bridge/macro %{_build_root}%{_installation_directory}/edex-environment/macro
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
cp ${DELIVERABLES}/scripts/functions/*.sh \ cp ${DELIVERABLES}/scripts/functions/*.sh \
%{_build_root}%{_installation_directory}/wes2bridge/macro/functions %{_build_root}%{_installation_directory}/edex-environment/macro/functions
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
@ -274,7 +274,7 @@ popd > /dev/null 2>&1
/awips2/edex/bin/linux-x86-32/*.conf /awips2/edex/bin/linux-x86-32/*.conf
/awips2/edex/bin/setup.env /awips2/edex/bin/setup.env
%dir /usr/local/wes2bridge %dir /usr/local/edex-environment
%defattr(755,awips,fxalpha,755) %defattr(755,awips,fxalpha,755)
%dir /awips2/edex/bin %dir /awips2/edex/bin
@ -283,16 +283,16 @@ popd > /dev/null 2>&1
/awips2/edex/bin/wrapper.jar /awips2/edex/bin/wrapper.jar
%defattr(644,root,root,755) %defattr(644,root,root,755)
%dir /awips2/wes2bridge %dir /awips2/edex-environment
%dir /awips2/wes2bridge/scripts %dir /awips2/edex-environment/scripts
/awips2/wes2bridge/scripts/* /awips2/edex-environment/scripts/*
%dir /awips2/wes2bridge/macro %dir /awips2/edex-environment/macro
%dir /awips2/wes2bridge/macro/utilities %dir /awips2/edex-environment/macro/utilities
/awips2/wes2bridge/macro/utilities/* /awips2/edex-environment/macro/utilities/*
%dir /awips2/wes2bridge/macro/functions %dir /awips2/edex-environment/macro/functions
/awips2/wes2bridge/macro/functions/* /awips2/edex-environment/macro/functions/*
/etc/profile.d/awips2-wes2bridge-env.sh /etc/profile.d/awips2-edex-env.sh
/etc/profile.d/awips2-wes2bridge-env.csh /etc/profile.d/awips2-edex-env.csh
%defattr(700,root,root,755) %defattr(700,root,root,755)
/awips2/wes2bridge/macro/wes2bridge /awips2/edex-environment/macro/edex-environment

4
rpms/awips2.wes2bridge/wes2bridge.files/build/build.sh → rpms/awips2.edex-environment/wes2bridge.files/build/build.sh
View file

@ -28,7 +28,7 @@ if [ "${BASELINE_WORKSPACE}" = "" ]; then
export BASELINE_WORKSPACE="${U_BASELINE_WORKSPACE}" export BASELINE_WORKSPACE="${U_BASELINE_WORKSPACE}"
fi fi
WES2BRIDGE="${BASELINE_WORKSPACE}/Installer.rpm/awips2.wes2bridge" EDEX_ENV="${BASELINE_WORKSPACE}/Installer.rpm/awips2.edex-environment"
/usr/bin/rpmbuild -ba --target=i386 \ /usr/bin/rpmbuild -ba --target=i386 \
--define '_topdir %(echo ${RPM_DESTINATION})' \ --define '_topdir %(echo ${RPM_DESTINATION})' \
@ -38,7 +38,7 @@ WES2BRIDGE="${BASELINE_WORKSPACE}/Installer.rpm/awips2.wes2bridge"
--define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \ --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
--define '_baseline_workspace %(echo ${BASELINE_WORKSPACE})' \ --define '_baseline_workspace %(echo ${BASELINE_WORKSPACE})' \
--buildroot ${BUILD_ROOT} \ --buildroot ${BUILD_ROOT} \
${WES2BRIDGE}/edex/component.spec ${EDEX_ENV}/edex/component.spec
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi

9
rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.csh Normal file
View file

@ -0,0 +1,9 @@
#!/bin/csh
set EDEX_ENV_PATH="/awips2/edex-environment/macro"
if $?PATH then
setenv PATH ${EDEX_ENV_PATH}:$PATH
else
setenv PATH ${EDEX_ENV_PATH}
endif

10
rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.sh Normal file
View file

@ -0,0 +1,10 @@
#!/bin/bash
EDEX_ENV_PATH="/awips2/edex-environment/macro"
CHECK_PATH=`echo ${PATH} | grep ${EDEX_ENV_PATH}`
if [ ! "${CHECK_PATH}" = "" ]; then
return
fi
export PATH=${EDEX_ENV_PATH}:${PATH}

16
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/wes2bridge → rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# wes2bridge environment # edex-environment environment
dir="/awips2/wes2bridge/macro" dir="/awips2/edex-environment/macro"
export WES2BRIDGE_DIR="/usr/local/wes2bridge" export EDEX_ENV_DIR="/usr/local/edex-environment"
export UTILITIES="${dir}/utilities" export UTILITIES="${dir}/utilities"
# access functions # access functions
@ -15,11 +15,11 @@ popd > /dev/null 2>&1
function usage() function usage()
{ {
echo "Usage: wes2bridge -create \${CONFIG_FILE} [--start]" echo "Usage: edex-environment -create \${CONFIG_FILE} [--start]"
echo " wes2bridge -start { \${CONFIG_FILE} | -name \${NAME} }" echo " edex-environment -start { \${CONFIG_FILE} | -name \${NAME} }"
echo " wes2bridge -stop { \${CONFIG_FILE} | -name \${NAME} }" echo " edex-environment -stop { \${CONFIG_FILE} | -name \${NAME} }"
echo " wes2bridge -remove { \${CONFIG_FILE} | -name \${NAME} }" echo " edex-environment -remove { \${CONFIG_FILE} | -name \${NAME} }"
echo " wes2bridge --list" echo " edex-environment --list"
} }
function parseCreate() function parseCreate()

30
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/create.sh → rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/create.sh
View file

@ -13,14 +13,14 @@ function createEnvironment()
fi fi
# Ensure that an environment does not already exist. # Ensure that an environment does not already exist.
if [ -d ${WES2BRIDGE_DIR}/${env_name} ]; then if [ -d ${EDEX_ENV_DIR}/${env_name} ]; then
echo "ERROR: An edex environment with name = ${env_name} already exists." echo "ERROR: An edex environment with name = ${env_name} already exists."
return 1 return 1
fi fi
# An environment does not exist. Create it. # An environment does not exist. Create it.
# 1) Create the root directory. # 1) Create the root directory.
mkdir -p ${WES2BRIDGE_DIR}/${env_name} mkdir -p ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Failed to create the ${env_name} environment root directory." echo "ERROR: Failed to create the ${env_name} environment root directory."
return 1 return 1
@ -28,37 +28,37 @@ function createEnvironment()
# 2) Create the environment by copying components in /awips2. # 2) Create the environment by copying components in /awips2.
# /awips2/edex # /awips2/edex
cp -r /awips2/edex ${WES2BRIDGE_DIR}/${env_name} cp -r /awips2/edex ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to place edex in the ${env_name} environment." echo "ERROR: Unable to place edex in the ${env_name} environment."
return 1 return 1
fi fi
# /awips2/GFESuite # /awips2/GFESuite
cp -r /awips2/GFESuite ${WES2BRIDGE_DIR}/${env_name} cp -r /awips2/GFESuite ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to place GFESuite in the ${env_name} environment." echo "ERROR: Unable to place GFESuite in the ${env_name} environment."
return 1 return 1
fi fi
# /awips2/database # /awips2/database
cp -r /awips2/database ${WES2BRIDGE_DIR}/${env_name} cp -r /awips2/database ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to place the database in the ${env_name} environment." echo "ERROR: Unable to place the database in the ${env_name} environment."
return 1 return 1
fi fi
# /awips2/data # /awips2/data
cp -r /awips2/data ${WES2BRIDGE_DIR}/${env_name} cp -r /awips2/data ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to place the database in the ${env_name} environment." echo "ERROR: Unable to place the database in the ${env_name} environment."
return 1 return 1
fi fi
# /awips2/postgresql # /awips2/postgresql
cp -r /awips2/postgresql ${WES2BRIDGE_DIR}/${env_name} cp -r /awips2/postgresql ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to place postgresql in the ${env_name} environment." echo "ERROR: Unable to place postgresql in the ${env_name} environment."
return 1 return 1
fi fi
# /awips2/qpid # /awips2/qpid
cp -r /awips2/qpid ${WES2BRIDGE_DIR}/${env_name} cp -r /awips2/qpid ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to place qpid in the ${env_name} environment." echo "ERROR: Unable to place qpid in the ${env_name} environment."
return 1 return 1
@ -66,7 +66,7 @@ function createEnvironment()
# 3) Update the links in: data/pg_tblspc # 3) Update the links in: data/pg_tblspc
pushd . > /dev/null 2>&1 pushd . > /dev/null 2>&1
cd ${WES2BRIDGE_DIR}/${env_name}/data/pg_tblspc cd ${EDEX_ENV_DIR}/${env_name}/data/pg_tblspc
for link in `ls -1`; do for link in `ls -1`; do
linked_dir=`readlink ${link}` linked_dir=`readlink ${link}`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -83,7 +83,7 @@ function createEnvironment()
return 1 return 1
fi fi
# Create a new link to the correct location. # Create a new link to the correct location.
ln -sf ${WES2BRIDGE_DIR}/${env_name}/data/${data_dir} ${link} ln -sf ${EDEX_ENV_DIR}/${env_name}/data/${data_dir} ${link}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi
@ -91,7 +91,7 @@ function createEnvironment()
popd > /dev/null 2>&1 popd > /dev/null 2>&1
# 4) Create a directory for the environment-specific start (init.d) scripts. # 4) Create a directory for the environment-specific start (init.d) scripts.
mkdir -p ${WES2BRIDGE_DIR}/${env_name}/wes2bridge mkdir -p ${EDEX_ENV_DIR}/${env_name}/edex-environment
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
@ -104,21 +104,21 @@ function createEnvironment()
fi fi
# 6) Adjust permissions. # 6) Adjust permissions.
chown -R awips:fxalpha ${WES2BRIDGE_DIR}/${env_name} chown -R awips:fxalpha ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi
chmod -R 775 ${WES2BRIDGE_DIR}/${env_name}/edex/data chmod -R 775 ${EDEX_ENV_DIR}/${env_name}/edex/data
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi
# 7) Lockdown the startup scripts. # 7) Lockdown the startup scripts.
chown root:root ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/* chown root:root ${EDEX_ENV_DIR}/${env_name}/edex-environment/*
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi
chmod 644 ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/* chmod 644 ${EDEX_ENV_DIR}/${env_name}/edex-environment/*
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
return 1 return 1
fi fi

2
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/list.sh → rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/list.sh
View file

@ -3,7 +3,7 @@
function listEnvironments() function listEnvironments()
{ {
pushd . > /dev/null 2>&1 pushd . > /dev/null 2>&1
cd ${WES2BRIDGE_DIR} cd ${EDEX_ENV_DIR}
echo "Existing EDEX Environment(s):" echo "Existing EDEX Environment(s):"
for env_dir in `ls -1`; do for env_dir in `ls -1`; do
echo " -${env_dir}" echo " -${env_dir}"

4
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/remove.sh → rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/remove.sh
View file

@ -32,13 +32,13 @@ function removeEnvironmentInternal()
env_name="${1}" env_name="${1}"
# Ensure that the environment exists. # Ensure that the environment exists.
if [ ! -d ${WES2BRIDGE_DIR}/${env_name} ]; then if [ ! -d ${EDEX_ENV_DIR}/${env_name} ]; then
echo "ERROR: The ${env_name} environment does not exist yet." echo "ERROR: The ${env_name} environment does not exist yet."
return 1 return 1
fi fi
# Remove the environment. # Remove the environment.
rm -rf ${WES2BRIDGE_DIR}/${env_name} rm -rf ${EDEX_ENV_DIR}/${env_name}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Unable to remove the ${env_name} environment." echo "ERROR: Unable to remove the ${env_name} environment."
return 1 return 1

10
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/start.sh → rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/start.sh
View file

@ -32,28 +32,28 @@ function startEnvironmentInternal()
env_name="${1}" env_name="${1}"
# Ensure that the environment exists. # Ensure that the environment exists.
if [ ! -d ${WES2BRIDGE_DIR}/${env_name} ]; then if [ ! -d ${EDEX_ENV_DIR}/${env_name} ]; then
echo "ERROR: The ${env_name} environment does not exist yet." echo "ERROR: The ${env_name} environment does not exist yet."
return 1 return 1
fi fi
# Verify that the environment is not missing any startup scripts. # Verify that the environment is not missing any startup scripts.
if [ ! -f ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/edex_camel ]; then if [ ! -f ${EDEX_ENV_DIR}/${env_name}/edex-environment/edex_camel ]; then
echo "ERROR: The ${env_name} environment is corrupt. Recreate it." echo "ERROR: The ${env_name} environment is corrupt. Recreate it."
return 1 return 1
fi fi
if [ ! -f ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/edex_postgres ]; then if [ ! -f ${EDEX_ENV_DIR}/${env_name}/edex-environment/edex_postgres ]; then
echo "ERROR: The ${env_name} environment is corrupt. Recreate it." echo "ERROR: The ${env_name} environment is corrupt. Recreate it."
return 1 return 1
fi fi
if [ ! -f ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/qpidd ]; then if [ ! -f ${EDEX_ENV_DIR}/${env_name}/edex-environment/qpidd ]; then
echo "ERROR: The ${env_name} environment is corrupt. Recreate it." echo "ERROR: The ${env_name} environment is corrupt. Recreate it."
return 1 return 1
fi fi
# Start the environment. # Start the environment.
pushd . > /dev/null 2>&1 pushd . > /dev/null 2>&1
cd ${WES2BRIDGE_DIR}/${env_name}/wes2bridge cd ${EDEX_ENV_DIR}/${env_name}/edex-environment
# Start PostgreSQL. # Start PostgreSQL.
/bin/bash edex_postgres start /bin/bash edex_postgres start
echo echo

10
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/stop.sh → rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/stop.sh
View file

@ -32,28 +32,28 @@ function stopEnvironmentInternal()
env_name="${1}" env_name="${1}"
# Ensure that the environment exists. # Ensure that the environment exists.
if [ ! -d ${WES2BRIDGE_DIR}/${env_name} ]; then if [ ! -d ${EDEX_ENV_DIR}/${env_name} ]; then
echo "ERROR: The ${env_name} environment does not exist yet." echo "ERROR: The ${env_name} environment does not exist yet."
return 1 return 1
fi fi
# Verify that the environment is not missing any startup scripts. # Verify that the environment is not missing any startup scripts.
if [ ! -f ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/edex_camel ]; then if [ ! -f ${EDEX_ENV_DIR}/${env_name}/edex-environment/edex_camel ]; then
echo "ERROR: The ${env_name} environment is corrupt. Recreate it." echo "ERROR: The ${env_name} environment is corrupt. Recreate it."
return 1 return 1
fi fi
if [ ! -f ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/edex_postgres ]; then if [ ! -f ${EDEX_ENV_DIR}/${env_name}/edex-environment/edex_postgres ]; then
echo "ERROR: The ${env_name} environment is corrupt. Recreate it." echo "ERROR: The ${env_name} environment is corrupt. Recreate it."
return 1 return 1
fi fi
if [ ! -f ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/qpidd ]; then if [ ! -f ${EDEX_ENV_DIR}/${env_name}/edex-environment/qpidd ]; then
echo "ERROR: The ${env_name} environment is corrupt. Recreate it." echo "ERROR: The ${env_name} environment is corrupt. Recreate it."
return 1 return 1
fi fi
# Stop the environment. # Stop the environment.
pushd . > /dev/null 2>&1 pushd . > /dev/null 2>&1
cd ${WES2BRIDGE_DIR}/${env_name}/wes2bridge cd ${EDEX_ENV_DIR}/${env_name}/edex-environment
# Stop EDEX. # Stop EDEX.
/bin/bash edex_camel stop /bin/bash edex_camel stop
echo echo

9
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.csh
View file

@ -1,9 +0,0 @@
#!/bin/csh
set WES2BRIDGE_PATH="/awips2/wes2bridge/macro"
if $?PATH then
setenv PATH ${WES2BRIDGE_PATH}:$PATH
else
setenv PATH ${WES2BRIDGE_PATH}
endif

10
rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.sh
View file

@ -1,10 +0,0 @@
#!/bin/bash
WES2BRIDGE_PATH="/awips2/wes2bridge/macro"
CHECK_PATH=`echo ${PATH} | grep ${WES2BRIDGE_PATH}`
if [ ! "${CHECK_PATH}" = "" ]; then
return
fi
export PATH=${WES2BRIDGE_PATH}:${PATH}

2
rpms/common/yum/arch.x86/comps.xml
View file

@ -90,7 +90,7 @@
<packagereq type="default">awips2-maps-database</packagereq> <packagereq type="default">awips2-maps-database</packagereq>
<packagereq type="default">awips2-database-standalone-configuration</packagereq> <packagereq type="default">awips2-database-standalone-configuration</packagereq>
<packagereq type="default">awips2-wes2bridge-edex</packagereq> <packagereq type="default">awips2-edex-environment</packagereq>
<packagereq type="default">awips2-edex-native</packagereq> <packagereq type="default">awips2-edex-native</packagereq>
<packagereq type="default">awips2-edex-shapefiles</packagereq> <packagereq type="default">awips2-edex-shapefiles</packagereq>
<packagereq type="default">awips2-gfesuite-server</packagereq> <packagereq type="default">awips2-gfesuite-server</packagereq>