From 1397ac4ae6b53366b84dded755683abb18849343 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Tue, 5 Jun 2012 16:55:52 -0500 Subject: [PATCH] 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. Former-commit-id: 8366f5bffa7a0566dcb4c4ea1449b8d653dc5363 [formerly 3478f3089184c56b7b24db9cb424703027c84e4e] [formerly b8622629e395530d0446f412697cd5cb2c8be032] [formerly c0db02e3775926c0fc6c2ed7e4a98f396f0a858d [formerly b8622629e395530d0446f412697cd5cb2c8be032 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]] Former-commit-id: c0db02e3775926c0fc6c2ed7e4a98f396f0a858d Former-commit-id: b02340a5b6e6f0e27447ad5a1f532ed0a3b37d18 [formerly d92eb0c2278e2afd7b735120e7704330947b6d53] Former-commit-id: 733b34202f3ce1391087d3b4114364bee3900f61 --- .../Wes2BridgeConfiguration.java | 2 +- .../wes2bridge/manager/Wes2BridgeManager.java | 6 +- .../edex/component.spec | 74 +++++++++---------- .../wes2bridge.files/build/build.sh | 4 +- .../profile.d/awips2-edex-env.csh | 9 +++ .../deliverables/profile.d/awips2-edex-env.sh | 10 +++ .../deliverables/scripts/edex-environment} | 16 ++-- .../deliverables/scripts/functions/create.sh | 30 ++++---- .../deliverables/scripts/functions/list.sh | 2 +- .../deliverables/scripts/functions/remove.sh | 4 +- .../deliverables/scripts/functions/start.sh | 10 +-- .../deliverables/scripts/functions/stop.sh | 10 +-- .../profile.d/awips2-wes2bridge-env.csh | 9 --- .../profile.d/awips2-wes2bridge-env.sh | 10 --- rpms/common/yum/arch.x86/comps.xml | 2 +- 15 files changed, 99 insertions(+), 99 deletions(-) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/edex/component.spec (76%) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/wes2bridge.files/build/build.sh (92%) create mode 100644 rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.csh create mode 100644 rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.sh rename rpms/{awips2.wes2bridge/wes2bridge.files/deliverables/scripts/wes2bridge => awips2.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment} (85%) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/wes2bridge.files/deliverables/scripts/functions/create.sh (77%) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/wes2bridge.files/deliverables/scripts/functions/list.sh (89%) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/wes2bridge.files/deliverables/scripts/functions/remove.sh (90%) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/wes2bridge.files/deliverables/scripts/functions/start.sh (81%) rename rpms/{awips2.wes2bridge => awips2.edex-environment}/wes2bridge.files/deliverables/scripts/functions/stop.sh (80%) delete mode 100644 rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.csh delete mode 100644 rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.sh diff --git a/javaUtilities/com.raytheon.wes2bridge.common/src/com/raytheon/wes2bridge/common/configuration/Wes2BridgeConfiguration.java b/javaUtilities/com.raytheon.wes2bridge.common/src/com/raytheon/wes2bridge/common/configuration/Wes2BridgeConfiguration.java index f0008951b9..ee50592e89 100644 --- a/javaUtilities/com.raytheon.wes2bridge.common/src/com/raytheon/wes2bridge/common/configuration/Wes2BridgeConfiguration.java +++ b/javaUtilities/com.raytheon.wes2bridge.common/src/com/raytheon/wes2bridge/common/configuration/Wes2BridgeConfiguration.java @@ -67,7 +67,7 @@ public class Wes2BridgeConfiguration { ConfigurationException exception = new ConfigurationException( - "The Wes2Bridge name cannot contain spaces."); + "The Edex Environment name cannot contain spaces."); exception.fillInStackTrace(); throw exception; diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java index a94b0e93fd..f9c99cee34 100644 --- a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java +++ b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java @@ -29,9 +29,9 @@ public class Wes2BridgeManager private static final String AWIPSII = "/awips2"; private static final String AWIPSII_WES2BRIDGE_SCRIPTS = - AWIPSII + "/wes2bridge/scripts"; + AWIPSII + "/edex-environment/scripts"; private static final String WES2BRIDGE_DIRECTORY = - "/usr/local/wes2bridge"; + "/usr/local/edex-environment"; private Wes2BridgeConfiguration configuration = null; private String wes2BridgeScripts = null; @@ -104,7 +104,7 @@ public class Wes2BridgeManager configuration.init(); this.wes2BridgeScripts = WES2BRIDGE_DIRECTORY + "/" + configuration.getTestCaseName() + "/" + - "wes2bridge"; + "edex-environment"; } /* diff --git a/rpms/awips2.wes2bridge/edex/component.spec b/rpms/awips2.edex-environment/edex/component.spec similarity index 76% rename from rpms/awips2.wes2bridge/edex/component.spec rename to rpms/awips2.edex-environment/edex/component.spec index 30240137bf..73b8819aad 100644 --- a/rpms/awips2.wes2bridge/edex/component.spec +++ b/rpms/awips2.edex-environment/edex/component.spec @@ -1,9 +1,9 @@ %define _installation_directory "/awips2" # -# awips2-wes2bridge-edex +# awips2-edex-environment # -Name: awips2-wes2bridge-edex -Summary: awips2-wes2bridge-edex +Name: awips2-edex-environment +Summary: awips2-edex-environment Version: %{_component_version} Release: %{_component_release} Group: AWIPSII @@ -15,7 +15,7 @@ Vendor: Raytheon Packager: Bryan Kowal AutoReq: no -provides: awips2-wes2bridge-edex +provides: awips2-edex-environment provides: awips2-edex-base provides: awips2-base-component provides: awips2-edex-gfe @@ -43,10 +43,10 @@ conflicts: awips2-edex-ncep conflicts: awips2-edex-core %description -The wes2bridge version of awips2-edex consists of the edex runtime and -the AWIPS II wes2bridge manager. The wes2bridge manager exists to spawn -and configure additional instances of the wes2bridge triad {postgresql, -qpid, edex}. The wes2bridge version of awips2-edex is not designed to +The edex environment version of awips2-edex consists of the edex runtime and +the AWIPS II edex-environment manager. The edex-environment manager exists to spawn +and configure additional instances of the AWIPS II processing triad {postgresql, +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. # 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 exit 1 fi -mkdir -p %{_build_root}%{_installation_directory}/wes2bridge/scripts +mkdir -p %{_build_root}%{_installation_directory}/edex-environment/scripts if [ $? -ne 0 ]; then exit 1 fi -mkdir -p %{_build_root}%{_installation_directory}/wes2bridge/macro/utilities +mkdir -p %{_build_root}%{_installation_directory}/edex-environment/macro/utilities if [ $? -ne 0 ]; then exit 1 fi -mkdir -p %{_build_root}%{_installation_directory}/wes2bridge/macro/functions +mkdir -p %{_build_root}%{_installation_directory}/edex-environment/macro/functions if [ $? -ne 0 ]; then exit 1 fi @@ -107,7 +107,7 @@ if [ $? -ne 0 ]; then fi # create the edex environment directory. -mkdir -p %{_build_root}/usr/local/wes2bridge +mkdir -p %{_build_root}/usr/local/edex-environment %build # build edex @@ -121,7 +121,7 @@ if [ $? -ne 0 ]; then fi popd > /dev/null 2>&1 -# build the wes2bridge utilities +# build the edex-environment utilities pushd . > /dev/null 2>&1 # Run the pde build. cd %{_baseline_workspace}/build.wes2bridge.utility @@ -152,7 +152,7 @@ popd > /dev/null 2>&1 # "install" the wes2bridge utilities cd %{_baseline_workspace}/com.raytheon.wes2bridge.configuration /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} \ -Drpm.build=true if [ $? -ne 0 ]; then @@ -160,7 +160,7 @@ if [ $? -ne 0 ]; then fi cd %{_baseline_workspace}/com.raytheon.wes2bridge.datalink /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} \ -Drpm.build=true if [ $? -ne 0 ]; then @@ -168,7 +168,7 @@ if [ $? -ne 0 ]; then fi cd %{_baseline_workspace}/com.raytheon.wes2bridge.manager /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} \ -Drpm.build=true 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. cp ${POSTGRES_INITD} \ - %{_build_root}%{_installation_directory}/wes2bridge/scripts + %{_build_root}%{_installation_directory}/edex-environment/scripts if [ $? -ne 0 ]; then exit 1 fi cp ${QPID_INITD} \ - %{_build_root}%{_installation_directory}/wes2bridge/scripts + %{_build_root}%{_installation_directory}/edex-environment/scripts if [ $? -ne 0 ]; then exit 1 fi cp ${QUEUE_SH} \ - %{_build_root}%{_installation_directory}/wes2bridge/scripts + %{_build_root}%{_installation_directory}/edex-environment/scripts if [ $? -ne 0 ]; then exit 1 fi cp ${EDEX_INITD} \ - %{_build_root}%{_installation_directory}/wes2bridge/scripts + %{_build_root}%{_installation_directory}/edex-environment/scripts if [ $? -ne 0 ]; then exit 1 fi -# Copy the wes2bridge macro, functions, and utilities. -DELIVERABLES="%{_baseline_workspace}/Installer.rpm/awips2.wes2bridge/wes2bridge.files/deliverables" +# Copy the edex-environment macro, functions, and utilities. +DELIVERABLES="%{_baseline_workspace}/Installer.rpm/awips2.edex-environment/wes2bridge.files/deliverables" # Macro and functions. -cp ${DELIVERABLES}/scripts/wes2bridge \ - %{_build_root}%{_installation_directory}/wes2bridge/macro +cp ${DELIVERABLES}/scripts/edex-environment \ + %{_build_root}%{_installation_directory}/edex-environment/macro if [ $? -ne 0 ]; then exit 1 fi cp ${DELIVERABLES}/scripts/functions/*.sh \ - %{_build_root}%{_installation_directory}/wes2bridge/macro/functions + %{_build_root}%{_installation_directory}/edex-environment/macro/functions if [ $? -ne 0 ]; then exit 1 fi @@ -274,7 +274,7 @@ popd > /dev/null 2>&1 /awips2/edex/bin/linux-x86-32/*.conf /awips2/edex/bin/setup.env -%dir /usr/local/wes2bridge +%dir /usr/local/edex-environment %defattr(755,awips,fxalpha,755) %dir /awips2/edex/bin @@ -283,16 +283,16 @@ popd > /dev/null 2>&1 /awips2/edex/bin/wrapper.jar %defattr(644,root,root,755) -%dir /awips2/wes2bridge -%dir /awips2/wes2bridge/scripts -/awips2/wes2bridge/scripts/* -%dir /awips2/wes2bridge/macro -%dir /awips2/wes2bridge/macro/utilities -/awips2/wes2bridge/macro/utilities/* -%dir /awips2/wes2bridge/macro/functions -/awips2/wes2bridge/macro/functions/* -/etc/profile.d/awips2-wes2bridge-env.sh -/etc/profile.d/awips2-wes2bridge-env.csh +%dir /awips2/edex-environment +%dir /awips2/edex-environment/scripts +/awips2/edex-environment/scripts/* +%dir /awips2/edex-environment/macro +%dir /awips2/edex-environment/macro/utilities +/awips2/edex-environment/macro/utilities/* +%dir /awips2/edex-environment/macro/functions +/awips2/edex-environment/macro/functions/* +/etc/profile.d/awips2-edex-env.sh +/etc/profile.d/awips2-edex-env.csh %defattr(700,root,root,755) -/awips2/wes2bridge/macro/wes2bridge \ No newline at end of file +/awips2/edex-environment/macro/edex-environment \ No newline at end of file diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/build/build.sh b/rpms/awips2.edex-environment/wes2bridge.files/build/build.sh similarity index 92% rename from rpms/awips2.wes2bridge/wes2bridge.files/build/build.sh rename to rpms/awips2.edex-environment/wes2bridge.files/build/build.sh index fd02433b23..4a1fa7b153 100644 --- a/rpms/awips2.wes2bridge/wes2bridge.files/build/build.sh +++ b/rpms/awips2.edex-environment/wes2bridge.files/build/build.sh @@ -28,7 +28,7 @@ if [ "${BASELINE_WORKSPACE}" = "" ]; then export BASELINE_WORKSPACE="${U_BASELINE_WORKSPACE}" fi -WES2BRIDGE="${BASELINE_WORKSPACE}/Installer.rpm/awips2.wes2bridge" +EDEX_ENV="${BASELINE_WORKSPACE}/Installer.rpm/awips2.edex-environment" /usr/bin/rpmbuild -ba --target=i386 \ --define '_topdir %(echo ${RPM_DESTINATION})' \ @@ -38,7 +38,7 @@ WES2BRIDGE="${BASELINE_WORKSPACE}/Installer.rpm/awips2.wes2bridge" --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \ --define '_baseline_workspace %(echo ${BASELINE_WORKSPACE})' \ --buildroot ${BUILD_ROOT} \ - ${WES2BRIDGE}/edex/component.spec + ${EDEX_ENV}/edex/component.spec if [ $? -ne 0 ]; then exit 1 fi diff --git a/rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.csh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.csh new file mode 100644 index 0000000000..abcd07e5f7 --- /dev/null +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.csh @@ -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 diff --git a/rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.sh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.sh new file mode 100644 index 0000000000..e95b65ca4a --- /dev/null +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/profile.d/awips2-edex-env.sh @@ -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} diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/wes2bridge b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment similarity index 85% rename from rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/wes2bridge rename to rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment index f47473288d..c00a8cf6b1 100755 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/wes2bridge +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment @@ -1,8 +1,8 @@ #!/bin/bash -# wes2bridge environment -dir="/awips2/wes2bridge/macro" -export WES2BRIDGE_DIR="/usr/local/wes2bridge" +# edex-environment environment +dir="/awips2/edex-environment/macro" +export EDEX_ENV_DIR="/usr/local/edex-environment" export UTILITIES="${dir}/utilities" # access functions @@ -15,11 +15,11 @@ popd > /dev/null 2>&1 function usage() { - echo "Usage: wes2bridge -create \${CONFIG_FILE} [--start]" - echo " wes2bridge -start { \${CONFIG_FILE} | -name \${NAME} }" - echo " wes2bridge -stop { \${CONFIG_FILE} | -name \${NAME} }" - echo " wes2bridge -remove { \${CONFIG_FILE} | -name \${NAME} }" - echo " wes2bridge --list" + echo "Usage: edex-environment -create \${CONFIG_FILE} [--start]" + echo " edex-environment -start { \${CONFIG_FILE} | -name \${NAME} }" + echo " edex-environment -stop { \${CONFIG_FILE} | -name \${NAME} }" + echo " edex-environment -remove { \${CONFIG_FILE} | -name \${NAME} }" + echo " edex-environment --list" } function parseCreate() diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/create.sh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/create.sh similarity index 77% rename from rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/create.sh rename to rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/create.sh index 70caed0bd3..0ca9323a13 100644 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/create.sh +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/create.sh @@ -13,14 +13,14 @@ function createEnvironment() fi # 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." return 1 fi # An environment does not exist. Create it. # 1) Create the root directory. - mkdir -p ${WES2BRIDGE_DIR}/${env_name} + mkdir -p ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Failed to create the ${env_name} environment root directory." return 1 @@ -28,37 +28,37 @@ function createEnvironment() # 2) Create the environment by copying components in /awips2. # /awips2/edex - cp -r /awips2/edex ${WES2BRIDGE_DIR}/${env_name} + cp -r /awips2/edex ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to place edex in the ${env_name} environment." return 1 fi # /awips2/GFESuite - cp -r /awips2/GFESuite ${WES2BRIDGE_DIR}/${env_name} + cp -r /awips2/GFESuite ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to place GFESuite in the ${env_name} environment." return 1 fi # /awips2/database - cp -r /awips2/database ${WES2BRIDGE_DIR}/${env_name} + cp -r /awips2/database ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to place the database in the ${env_name} environment." return 1 fi # /awips2/data - cp -r /awips2/data ${WES2BRIDGE_DIR}/${env_name} + cp -r /awips2/data ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to place the database in the ${env_name} environment." return 1 fi # /awips2/postgresql - cp -r /awips2/postgresql ${WES2BRIDGE_DIR}/${env_name} + cp -r /awips2/postgresql ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to place postgresql in the ${env_name} environment." return 1 fi # /awips2/qpid - cp -r /awips2/qpid ${WES2BRIDGE_DIR}/${env_name} + cp -r /awips2/qpid ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to place qpid in the ${env_name} environment." return 1 @@ -66,7 +66,7 @@ function createEnvironment() # 3) Update the links in: data/pg_tblspc 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 linked_dir=`readlink ${link}` if [ $? -ne 0 ]; then @@ -83,7 +83,7 @@ function createEnvironment() return 1 fi # 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 return 1 fi @@ -91,7 +91,7 @@ function createEnvironment() popd > /dev/null 2>&1 # 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 exit 1 fi @@ -104,21 +104,21 @@ function createEnvironment() fi # 6) Adjust permissions. - chown -R awips:fxalpha ${WES2BRIDGE_DIR}/${env_name} + chown -R awips:fxalpha ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then return 1 fi - chmod -R 775 ${WES2BRIDGE_DIR}/${env_name}/edex/data + chmod -R 775 ${EDEX_ENV_DIR}/${env_name}/edex/data if [ $? -ne 0 ]; then return 1 fi # 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 return 1 fi - chmod 644 ${WES2BRIDGE_DIR}/${env_name}/wes2bridge/* + chmod 644 ${EDEX_ENV_DIR}/${env_name}/edex-environment/* if [ $? -ne 0 ]; then return 1 fi diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/list.sh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/list.sh similarity index 89% rename from rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/list.sh rename to rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/list.sh index 3ae3d92155..5b840e0870 100644 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/list.sh +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/list.sh @@ -3,7 +3,7 @@ function listEnvironments() { pushd . > /dev/null 2>&1 - cd ${WES2BRIDGE_DIR} + cd ${EDEX_ENV_DIR} echo "Existing EDEX Environment(s):" for env_dir in `ls -1`; do echo " -${env_dir}" diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/remove.sh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/remove.sh similarity index 90% rename from rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/remove.sh rename to rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/remove.sh index a398bf79fc..1494ffbbc0 100644 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/remove.sh +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/remove.sh @@ -32,13 +32,13 @@ function removeEnvironmentInternal() env_name="${1}" # 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." return 1 fi # Remove the environment. - rm -rf ${WES2BRIDGE_DIR}/${env_name} + rm -rf ${EDEX_ENV_DIR}/${env_name} if [ $? -ne 0 ]; then echo "ERROR: Unable to remove the ${env_name} environment." return 1 diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/start.sh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/start.sh similarity index 81% rename from rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/start.sh rename to rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/start.sh index 2d4511ebd5..ab5fd0b76a 100644 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/start.sh +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/start.sh @@ -32,28 +32,28 @@ function startEnvironmentInternal() env_name="${1}" # 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." return 1 fi # 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." return 1 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." return 1 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." return 1 fi # Start the environment. pushd . > /dev/null 2>&1 - cd ${WES2BRIDGE_DIR}/${env_name}/wes2bridge + cd ${EDEX_ENV_DIR}/${env_name}/edex-environment # Start PostgreSQL. /bin/bash edex_postgres start echo diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/stop.sh b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/stop.sh similarity index 80% rename from rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/stop.sh rename to rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/stop.sh index a3c4c1e7ba..e5545500cf 100644 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/scripts/functions/stop.sh +++ b/rpms/awips2.edex-environment/wes2bridge.files/deliverables/scripts/functions/stop.sh @@ -32,28 +32,28 @@ function stopEnvironmentInternal() env_name="${1}" # 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." return 1 fi # 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." return 1 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." return 1 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." return 1 fi # Stop the environment. pushd . > /dev/null 2>&1 - cd ${WES2BRIDGE_DIR}/${env_name}/wes2bridge + cd ${EDEX_ENV_DIR}/${env_name}/edex-environment # Stop EDEX. /bin/bash edex_camel stop echo diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.csh b/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.csh deleted file mode 100644 index b22c01dbc2..0000000000 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.csh +++ /dev/null @@ -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 diff --git a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.sh b/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.sh deleted file mode 100644 index 4caf1aa90f..0000000000 --- a/rpms/awips2.wes2bridge/wes2bridge.files/deliverables/profile.d/awips2-wes2bridge-env.sh +++ /dev/null @@ -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} diff --git a/rpms/common/yum/arch.x86/comps.xml b/rpms/common/yum/arch.x86/comps.xml index 23f8449cd9..737d379664 100644 --- a/rpms/common/yum/arch.x86/comps.xml +++ b/rpms/common/yum/arch.x86/comps.xml @@ -90,7 +90,7 @@ awips2-maps-database awips2-database-standalone-configuration - awips2-wes2bridge-edex + awips2-edex-environment awips2-edex-native awips2-edex-shapefiles awips2-gfesuite-server