common-base no longer manages cave plugins

rpms/awips2.core/Installer.common-base/component.spec

@@ -30,7 +30,7 @@ BuildRequires: awips2-ant
 BuildRequires: awips2-java
 
 %description
-AWIPS II Common Base - Contains common plugins utilized by both EDEX and CAVE.
+AWIPS II Common Base - Contains common plugins utilized by EDEX.
 
 %prep
 # Ensure that a "buildroot" has been specified.
@@ -49,15 +49,18 @@ if [ $? -ne 0 ]; then
 fi
 
 %build
-
+_build_xml=build.xml
 BUILD_EDEX=%{_baseline_workspace}/build.edex
 EDEX_DIST=${BUILD_EDEX}/edex/dist
 
 cd ${BUILD_EDEX}
-/awips2/ant/bin/ant -f build.xml \
+/awips2/ant/bin/ant -f ${_build_xml} \
    -Dbuild.arch=x86_64 \
+   -Dfeature=com.raytheon.uf.common.base.feature \
    -Duframe.eclipse=%{_uframe_eclipse} \
-   buildHybrid
+   clean \
+   build \
+   clean
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -71,15 +74,6 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-RPMS_CORE=%{_baseline_workspace}/rpms/awips2.core
-RPMS_COMMON_BASE=${RPMS_CORE}/Installer.common-base
-SCRIPTS=${RPMS_COMMON_BASE}/scripts
-cp -vf ${RPMS_COMMON_BASE}/scripts/* %{_build_root}/awips2/cave
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-
 #create a list of all files packaged for /awips2/edex/data/utility
 UTILITY=/awips2/edex/data/utility
 if [ -d %{_build_root}/$UTILITY ]; then
@@ -116,29 +110,7 @@ else if [ $retVal -eq 0 ]; then
  fi
 fi
 
-# CAVE installed?
-
-# when the plugins are for CAVE, we need to
-# use the p2 director to install from a repository.
-rpm -q awips2-cave > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-   /bin/bash /awips2/cave/installCAVECommon.sh
-   rm -f /awips2/cave/installCAVECommon.sh   
-else
-   # hide the cave repository
-   pushd . > /dev/null 2>&1
-   cd /awips2
-   rm -rf .cave
-   mv cave .cave
-   popd > /dev/null 2>&1
-fi
-
-
-
 %preun
-if [ -d /awips2/.cave ]; then
-   rm -rf /awips2/.cave
-fi
 if [ -d /awips2/.edex ]; then
    rm -rf /awips2/.edex
 fi
@@ -153,8 +125,3 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir /awips2
 %dir /awips2/edex
 /awips2/edex/*
-
-%dir /awips2/cave
-/awips2/cave/*
-%dir /awips2/cave/.repository
-/awips2/cave/.repository/*

rpms/awips2.core/Installer.common-base/scripts/installCAVECommon.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# Set all paths required by CAVE before installing.
-export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:$LD_LIBRARY_PATH
-export LD_PRELOAD=libpython.so
-if [ -d /awips2/cave/lib ]; then
-   export LD_LIBRARY_PATH=/awips2/cave/lib/lib_illusion:$LD_LIBRARY_PATH
-fi
-if [ -d /awips2/cave/lib64 ]; then
-   export LD_LIBRARY_PATH=/awips2/cave/lib64/lib_illusion:$LD_LIBRARY_PATH
-fi
-# Need to use awips2-java to do this.
-export PATH=/awips2/java/bin:/awips2/python/bin:${PATH}
-export JAVA_HOME="/awips2/java/jre"
-
-# Set the CAVE logfile location.
-export LOGFILE_CAVE=/dev/null
-
-# Use the eclipse p2 manager.
-CAVE_EXE="/awips2/cave/cave"
-NOSPLASH_ARG="-nosplash"
-DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
-DESTINATION_ARG="-destination /awips2/cave"
-INSTALL_ARG="-i com.raytheon.uf.common.base.feature.feature.group"
-UNINSTALL_ARG="-u com.raytheon.uf.common.base.feature.feature.group"
-REPO="-repository file:/awips2/cave/.repository/"
-
-COMMON_CMD="${CAVE_EXE} ${NOSPLASH_ARG} ${DIRECTOR_APP} ${DESTINATION_ARG}"
-INSTALL_CMD="${COMMON_CMD} ${INSTALL_ARG} ${REPO}"
-UNINSTALL_CMD="${COMMON_CMD} ${UNINSTALL_ARG}"
-
-# Uninstall any existing components since the p2 director does not
-# support updating.
-# If the feature is not installed, this does not fail quietly.
-# Determine if the feature needs to be uninstalled.
-${UNINSTALL_CMD} -verifyOnly > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-   LOG_TIMESTAMP=`date`
-   echo "uninstall previous STARTED: ${LOG_TIMESTAMP}"
-   ${UNINSTALL_CMD}
-   LOG_TIMESTAMP=`date`
-   echo "uninstall previous COMPLETE: ${LOG_TIMESTAMP}"
-fi
-
-# complete the install
-LOG_TIMESTAMP=`date`
-echo "installation STARTED: ${LOG_TIMESTAMP}"
-${INSTALL_CMD}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-LOG_TIMESTAMP=`date`
-echo "installation COMPLETE: ${LOG_TIMESTAMP}"
-   
-# remove the repository
-if [ -f /awips2/cave/.repository/artifacts.xml ]; then
-   rm -f /awips2/cave/.repository/artifacts.xml
-fi
-   
-if [ -f /awips2/cave/.repository/content.xml ]; then
-   rm -f /awips2/cave/.repository/content.xml
-fi
-   
-if [ -d /awips2/cave/.repository/features ]; then
-   rm -rf /awips2/cave/.repository/features
-fi
-   
-if [ -d /awips2/cave/.repository/plugins ]; then
-   rm -rf /awips2/cave/.repository/plugins
-fi