diff --git a/.gitignore b/.gitignore
index a7219d0232..52f3a54fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ __pycache__
build/awips-ade/RPMS/
build/logs/
cave/com.raytheon.viz.ui.personalities.awips/splash.bmp
-dist/
+dist/el7*
diff --git a/build/setup.sh b/build/setup.sh
index 8d06f24045..28fff9ca86 100755
--- a/build/setup.sh
+++ b/build/setup.sh
@@ -75,6 +75,7 @@ if [[ $(whoami) == "awips" ]]; then # local build
# rsync -aP dist/${os_version}-
#TM#echo "rsync -aP dist/${os_version}-dev-${date} tiffanym@fserv:/share/awips2/${AWIPSII_VERSION}/linux/"
#TM#rsync -aP dist/${os_version}-dev-${date} tiffanym@fserv:/share/awips2/${AWIPSII_VERSION}/linux/
+ rsync -aP dist/${os_version}-dev-${date} awips@edex3:/awips2/dev
rsync -aP dist/${os_version}-dev-${date} awips@hardy:/awips2/dev
#repomanage -k1 --old dist/${os_version}-dev | xargs rm -f
#
diff --git a/cave/build/static/linux/cave/caveUtil.sh b/cave/build/static/linux/cave/caveUtil.sh
index 094446111c..9824c9a894 100644
--- a/cave/build/static/linux/cave/caveUtil.sh
+++ b/cave/build/static/linux/cave/caveUtil.sh
@@ -473,7 +473,7 @@ function deleteEclipseConfigurationDir()
function createEclipseConfigurationDir()
{
local d dir id=$(hostname)-$(whoami)
- for d in "$HOME/.cave-eclipse/"; do
+ for d in "$HOME/caveData/.cave-eclipse/"; do
if [[ $d == $HOME/* ]]; then
mkdir -p "$d" || continue
fi
diff --git a/dist/comps.xml b/dist/comps.xml
index c36b09105f..ce39aedb90 100755
--- a/dist/comps.xml
+++ b/dist/comps.xml
@@ -157,6 +157,148 @@
awips2-watchdog
+
+ awips2-ingest
+ AWIPS EDEX Decode/Ingest (No Database, PyPIES, GFE)
+ true
+ This Will Install the AWIPS Components That Are Required For ingesting and decoding data (used with ancillary machine installs)
+ true
+
+ awips2
+ awips2-version
+ awips2-cli
+ awips2-scripts
+
+ awips2-edex
+ awips2-edex-alertviz
+ awips2-edex-archive
+ awips2-edex-base
+ awips2-edex-binlightning
+ awips2-edex-bufr
+ awips2-edex-common-core
+ awips2-common-foss
+ awips2-common-base
+ awips2-edex-core
+ awips2-edex-registry-client
+ awips2-edex-datadelivery-client
+ awips2-edex-datadelivery-core
+ awips2-edex-foss
+ awips2-edex-foss-com-beust-jcommander
+ awips2-edex-foss-com-google-protobuf
+ awips2-edex-foss-com-mchange
+ awips2-edex-foss-com-sun-jna
+ awips2-edex-foss-edu-mit-ll-netcdf
+ awips2-edex-foss-javax-activation
+ awips2-edex-foss-javax-mail
+ awips2-edex-foss-javax-media-opengl
+ awips2-edex-foss-javax-servlet
+ awips2-edex-foss-net-dods
+ awips2-edex-foss-net-opengis
+ awips2-edex-foss-net-opengis_v2
+ awips2-edex-foss-net-sf-ehcache
+ awips2-edex-foss-ogc-tools-gml
+ awips2-edex-foss-org-apache-activemq
+ awips2-edex-foss-org-apache-camel
+ awips2-edex-foss-org-apache-commons-cli
+ awips2-edex-foss-org-apache-commons-compress
+ awips2-edex-foss-org-apache-commons-management
+ awips2-edex-foss-org-apache-commons-net
+ awips2-edex-foss-org-apache-commons-ssl
+ awips2-edex-foss-org-apache-commons-validator
+ awips2-edex-foss-org-apache-shiro
+ awips2-edex-foss-org-apache-ws-commons-schema
+ awips2-edex-foss-org-apache-ws-security
+ awips2-edex-foss-org-apache-xalan
+ awips2-edex-foss-org-apache-xml-resolver
+ awips2-edex-foss-org-apache-xml-security
+ awips2-edex-foss-org-apache-xml-serializer
+ awips2-edex-foss-org-dom4j
+ awips2-edex-foss-org-eclipse-jetty
+ awips2-edex-foss-org-itadaki-bzip2
+ awips2-edex-foss-org-jasypt
+ awips2-edex-foss-org-jfreechart
+ awips2-edex-foss-org-joda-time
+ awips2-edex-foss-org-objectweb
+ awips2-edex-foss-org-opensaml
+ awips2-edex-foss-org-w3-xmlschema
+ awips2-edex-foss-ucar-nc2
+ awips2-edex-dat
+ awips2-edex-dataplugins
+ awips2-edex-hydro
+ awips2-edex-ost
+ awips2-edex-radar
+ awips2-edex-probsevere
+ awips2-edex-satellite
+ awips2-edex-warning
+ awips2-edex-text
+ awips2-edex-aviation
+ awips2-edex-configuration
+ awips2-edex-npp
+ awips2-edex-ncep
+ awips2-edex-remote-script
+ awips2-edex-convectprob
+ awips2-edex-sportlma
+ awips2-edex-goesr
+ awips2-edex-grib-decoderpostprocessor
+ awips2-edex-mping
+ awips2-edex-nswrc-radar
+ awips2-edex-grid
+ awips2-edex-ogc-core
+ awips2-edex-ogc-wfs
+ awips2-edex-glmdecoder
+ awips2-edex-config-auto
+ awips2-edex-hazards
+ awips2-yajsw
+ awips2-edex-rcm
+ awips2-edex-mpe
+ awips2-edex-geodb
+ awips2-ldm
+
+ awips2-ignite
+ awips2-adapt-native
+ awips2-hydroapps-shared
+ awips2-java
+ awips2-notification
+ awips2-psql
+ pgadmin4
+ awips2-python
+ awips2-python-jep
+ awips2-qpid-broker-j
+ awips2-qpid-proton
+ awips2-rcm
+ awips2-aviation-shared
+
+ awips2-python-dynamicserialize
+ awips2-python-h5py
+ awips2-python-cycler
+ awips2-python-kiwisolver
+ awips2-python-backports-lru_cache
+ awips2-python-matplotlib
+ awips2-python-setuptools
+ awips2-python-numpy
+ awips2-qpid-proton-python
+ awips2-python-scipy
+ awips2-python-tables
+ awips2-python-thrift
+ awips2-python-tpg
+ awips2-python-ufpy
+ awips2-python-werkzeug
+ awips2-python-shapely
+ awips2-python-dateutil
+ awips2-python-pyparsing
+ awips2-python-pytz
+ awips2-python-six
+ awips2-python-pyshp
+ awips2-python-stomp.py
+ awips2-python-cftime
+ awips2-python-netcdf4
+ awips2-hdf5
+ awips2-netcdf
+ awips2-netcdf-devel
+ awips2-localapps-environment
+ awips2-watchdog
+
+
awips2-cave