diff --git a/build/build.sh b/build/build.sh
index ea7a89b304..6f6b1fd48e 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -43,7 +43,7 @@ pushd . > /dev/null 2>&1
cd ${BASELINE}
mkdir -p ${WORKSPACE}
if [[ ${2} = "buildCAVE" ]]; then
- RSYNC_DIRS=`cat $dir/rsync.dirs |grep -v nativelib`
+ RSYNC_DIRS=`cat $dir/rsync.dirs |grep -v nativelib | grep -v awips2-rpm`
else
RSYNC_DIRS=`cat $dir/rsync.dirs`
fi
diff --git a/build/build_rpms.sh b/build/build_rpms.sh
index 8e4e272fcf..9d569e7cf2 100755
--- a/build/build_rpms.sh
+++ b/build/build_rpms.sh
@@ -34,7 +34,6 @@ if [ ! -d awips2-goesr ]; then git clone https://github.com/Unidata/awi
if [ ! -d awips2-hazards ]; then git clone https://github.com/Unidata/awips2-hazards.git --branch development --single-branch ;fi
if [ ! -d awips2-ncep ]; then git clone https://github.com/Unidata/awips2-ncep.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
if [ ! -d awips2-nws ]; then git clone https://github.com/Unidata/awips2-nws.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
-if [ ! -d awips2-rpm ]; then git clone https://github.com/Unidata/awips2-rpm.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
if [ ! -d awips2-unidata ]; then git clone https://github.com/Unidata/awips2-unidata.git --branch unidata_${AWIPSII_VERSION} --single-branch ;fi
#
diff --git a/build/rsync.dirs b/build/rsync.dirs
index ab3038eac5..36bec06f0a 100644
--- a/build/rsync.dirs
+++ b/build/rsync.dirs
@@ -27,6 +27,7 @@ javaUtilities/* rpms pythonPackages
../python-awips
../awips2-cimss/viz/*
../awips2-cimss/edex/*
+../awips2-cimss/features/*
../awips2-cimss/common/*
../awips2-collaboration/viz/*
../awips2-collaboration/features/*
diff --git a/build/setup.sh b/build/setup.sh
index 556e9f6aee..65de694229 100755
--- a/build/setup.sh
+++ b/build/setup.sh
@@ -18,7 +18,7 @@ dirs=" -v `pwd`:/awips2/repo/awips2-builds:rw "
# If local source directories, exist, mount them to the container
if [ $rpmname = "buildCAVE" ]; then
- for dn in `cat build/repos| grep -v static| grep -v nativelib`
+ for dn in `cat build/repos| grep -v static| grep -v nativelib |grep -v awips2-rpm`
do
echo $dn
if [ -d /awips2/repo/$dn ]; then dirs+=" -v /awips2/repo/${dn}:/awips2/repo/${dn} ";fi
diff --git a/cave/build/features.txt b/cave/build/features.txt
index 685e73b541..f3228d019e 100644
--- a/cave/build/features.txt
+++ b/cave/build/features.txt
@@ -49,3 +49,16 @@ gov.noaa.gsd.viz.ensemble.feature
gov.noaa.nws.mdl.viz.awipsref.feature
gov.noaa.nws.obs.viz.geodata.feature
com.raytheon.uf.viz.server.edex.feature
+com.raytheon.uf.viz.dat.feature
+com.raytheon.uf.viz.datadelivery.feature
+edu.wisc.ssec.cimss.viz.convectprob.feature
+gov.noaa.nws.mdl.viz.boundaryTool.common.feature
+com.raytheon.uf.viz.satellite.goesr.feature
+com.raytheon.uf.viz.ohd.feature
+com.raytheon.uf.viz.scan.feature
+edu.ucar.unidata.uf.viz.feature
+gov.noaa.nws.ncep.swpc.viz.feature
+gov.noaa.nws.ocp.uf.viz.gisdatastore.feature
+gov.noaa.nws.ocp.viz.climate.feature
+gov.noaa.nws.ocp.viz.firewx.feature
+gov.noaa.nws.ocp.viz.psh.feature
diff --git a/cave/com.raytheon.uf.viz.dat.feature/.project b/cave/com.raytheon.uf.viz.dat.feature/.project
new file mode 100644
index 0000000000..c55f3adb50
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.dat.feature/.project
@@ -0,0 +1,17 @@
+
+
+ com.raytheon.uf.viz.dat.feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/cave/com.raytheon.uf.viz.dat.feature/build.properties b/cave/com.raytheon.uf.viz.dat.feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.dat.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/cave/com.raytheon.uf.viz.dat.feature/com.raytheon.uf.viz.dat.feature.ecl b/cave/com.raytheon.uf.viz.dat.feature/com.raytheon.uf.viz.dat.feature.ecl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cave/com.raytheon.uf.viz.scan.feature/build.properties b/cave/com.raytheon.uf.viz.scan.feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.scan.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index c0895ec263..11548ce210 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -123,6 +123,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dist/comps.xml b/dist/comps.xml
index 823d559fd1..035a70e015 100644
--- a/dist/comps.xml
+++ b/dist/comps.xml
@@ -195,7 +195,6 @@
awips2-edex-dat
awips2-edex-datadelivery
awips2-edex-hazards
- awips2-edex-ohd
awips2-edex-ogc
awips2-hydroapps
diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml
deleted file mode 100644
index e9e6727c91..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
-
- ffmp-ingest.xml
- scan-ingest.xml
- cwat-ingest.xml
- fog-ingest.xml
- vil-ingest.xml
- preciprate-ingest.xml
- qpf-ingest.xml
- fssobs-ingest.xml
- cpgsrv-spring.xml
-
-
-
-
- utility-common.xml
-
- geo-common.xml
- time-common.xml
- ffmp-ingest.xml
- ffmp-common.xml
- scan-ingest.xml
- scan-common.xml
- cwat-ingest.xml
- cwat-common.xml
- fog-ingest.xml
- fog-common.xml
- vil-ingest.xml
- vil-common.xml
- preciprate-ingest.xml
- preciprate-common.xml
- qpf-ingest.xml
- qpf-common.xml
- cpgsrv-spring.xml
- persist-ingest.xml
- binlightning-common.xml
- parameter-common.xml
- gridcoverage-common.xml
- grid-common.xml
- database-common.xml
- radar-common.xml
- text-common.xml
- level-common.xml
- levelhandler-common.xml
- pointdata-common.xml
- bufrua-common.xml
- shef-common.xml
- satellite-common.xml
- satellite-dataplugin-common.xml
- ohd-common-database.xml
- ohd-common.xml
- management-common.xml
- obs-common.xml
- fssobs-ingest.xml
- fssobs-common.xml
- manualIngest-common.xml
- dataaccess-common.xml
- nctext-common.xml
- statsTemplate
-
-
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml b/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml
deleted file mode 100644
index 34c4e81875..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
- obs-ingest-metarshef.xml
-
-
- distribution-spring.xml
- manualIngest-common.xml
- manualIngest-spring.xml
- shef-ingest.xml
- persist-ingest.xml
- obs-common.xml
- obs-ingest.xml
- obs-ingest-metarshef.xml
- metartohmdb-plugin.xml
- metartoclimate-plugin.xml
- pointdata-common.xml
- shef-common.xml
- ohd-common-database.xml
- ohd-common.xml
- alarmWhfs-spring.xml
- arealffgGenerator-spring.xml
- arealQpeGen-spring.xml
- DPADecoder-spring.xml
- dqcPreprocessor-spring.xml
- floodArchiver-spring.xml
- freezingLevel-spring.xml
- hpeDHRDecoder-spring.xml
- ihfsDbPurge-spring.xml
- logFilePurger-spring.xml
- mpeFieldgen-spring.xml
- mpeHpeFilePurge-spring.xml
- mpeLightningSrv-ingest.xml
- mpeProcessGrib-spring.xml
- ohdSetupService-spring.xml
- pointDataRetrievel-spring.xml
- q2FileProcessor-spring.xml
- satpre-spring.xml
- purge-logs.xml
- fssobs-ingest.xml
- fssobs-common.xml
- ndm-ingest.xml
-
-
- ohd-common-database.xml
- ohd-common.xml
- database-common.xml
- ohd-request.xml
- alertviz-request.xml
- auth-common.xml
- auth-request.xml
- persist-request.xml
- menus-request.xml
- utility-request.xml
- management-common.xml
- management-request.xml
- manualIngest-common.xml
- manualIngest-request.xml
- auth-request.xml
- persist-request.xml
- site-common.xml
- site-request.xml
- time-common.xml
- units-common.xml
- event-common.xml
- eventbus-common.xml
- edex-request.xml
- request-service.xml
- request-service-common.xml
-
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
deleted file mode 100644
index 5b1ed6d181..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
- grib-decode.xml
- grid-staticdata-process.xml
-
-
- time-common.xml
- auth-common.xml
- python-common.xml
- grib-decode.xml
- grid-staticdata-process.xml
- level-common.xml
- levelhandler-common.xml
- grid-common.xml
- gridcoverage-common.xml
- parameter-common.xml
- persist-ingest.xml
- management-common.xml
- database-common.xml
- event-ingest.xml
- statsTemplate
-
-
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml
deleted file mode 100644
index 6c2f0cccb3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
- ebxml.*\.xml
-
-
- statsTemplate
- database-common.xml
- dataaccess-common.xml
- time-common.xml
- auth-common.xml
- auth-request.xml
- management-common.xml
- event-common.xml
- purge-logs.xml
- ebxml.*\.xml
- eventbus-common.xml
- edex-security.xml
- geo-common.xml
- utility-request.xml
- utility-common.xml
- request-service
-
-
-
- ebxmlRegistry
-
-
-
-
- ebxmlRegistry
- stats-ingest.xml
-
-
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
index e4de577680..7d6c2fb3e6 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
@@ -28,7 +28,7 @@ ebxml.registry.host=localhost
# NCF HOST
ncf.host=165.92.30.69
# EBXML federation enable flag
-ebxml.registry.federation.enabled=true
+ebxml.registry.federation.enabled=false
# EBXML registry webserver home
ebxml.registry.webserver.home=/awips2/edex/webapps/registryEbxml/
# Enables/Disables logging of web service traffic
@@ -57,4 +57,4 @@ ebxml.registry.webservices.log.enabled=false
# 10.10.0-.-255|/foo/bar - all requests from IPs within 10.10.0.0/16 subnet to URI /foo/bar
# 10.10.0-3,1,3,7,15|/foo/* - all requests from IPs addresses with last octet equal to 1,3,7,15 in subnet 10.10.0.0/22 to URIs starting with /foo/
ebxml-webserver-ip-whitelist=
-ebxml-webserver-ip-blacklist=
\ No newline at end of file
+ebxml-webserver-ip-blacklist=
diff --git a/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml b/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml
new file mode 100644
index 0000000000..00bf7517f3
--- /dev/null
+++ b/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml
@@ -0,0 +1,328 @@
+
+
+
+
+
+ .*request.*
+ edex-security.xml
+ ebxml.*\.xml
+ grib-decode.xml
+ grid-staticdata-process.xml
+ .*(dpa|taf|nctext).*
+ webservices.xml
+ ebxml.*\.xml
+ .*datadelivery.*
+ .*bandwidth.*
+ .*sbn-simulator.*
+ hydrodualpol-ingest.xml
+ grid-metadata.xml
+ .*ogc.*
+ obs-ingest-metarshef.xml
+ ffmp-ingest.xml
+ scan-ingest.xml
+ cwat-ingest.xml
+ fog-ingest.xml
+ vil-ingest.xml
+ preciprate-ingest.xml
+ qpf-ingest.xml
+ fssobs-ingest.xml
+ cpgsrv-spring.xml
+
+
+
+ time-common.xml
+ auth-common.xml
+ python-common.xml
+ grib-decode.xml
+ grid-staticdata-process.xml
+ level-common.xml
+ levelhandler-common.xml
+ grid-common.xml
+ gridcoverage-common.xml
+ parameter-common.xml
+ persist-ingest.xml
+ management-common.xml
+ database-common.xml
+ event-ingest.xml
+ statsTemplate
+
+
+
+ .*request.*
+ .*common.*
+ grid-metadata.xml
+ event-datadelivery-common.xml
+ .*ogc.*
+ .*dpa.*
+
+
+
+ ingest
+ pluginExclude
+ goesrExclude
+ .*(airmet|atcf|aww|convsigmet|gfe|grid|hydro|intlsigmet|modis|ncpafm|ncuair|profiler|netcdf-grid).*
+ .*(nonconvsigmet|satellite|sgwh|ssha|stats|stormtrack|textlightning_ep|useradmin|wcp).*
+
+
+
+ ingest
+ pluginExclude
+ radarExclude
+
+
+
+ ingest
+ pluginExclude
+ radarExclude
+ goesrExclude
+
+
+
+ ^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lsr|modelsounding|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*
+
+
+
+ ^(binlightning|dmw|goesr|glm).*
+
+
+
+ ^radar.*
+
+
+
+ event-common.xml
+ eventbus-common.xml
+ stats-common.xml
+
+
+
+
+
+ distribution-spring.xml
+ manualIngest-common.xml
+ manualIngest-spring.xml
+ shef-ingest.xml
+ persist-ingest.xml
+ obs-common.xml
+ obs-ingest.xml
+ obs-ingest-metarshef.xml
+ metartohmdb-plugin.xml
+ metartoclimate-plugin.xml
+ pointdata-common.xml
+ shef-common.xml
+ ohd-common-database.xml
+ ohd-common.xml
+ alarmWhfs-spring.xml
+ arealffgGenerator-spring.xml
+ arealQpeGen-spring.xml
+ DPADecoder-spring.xml
+ dqcPreprocessor-spring.xml
+ floodArchiver-spring.xml
+ freezingLevel-spring.xml
+ hpeDHRDecoder-spring.xml
+ ihfsDbPurge-spring.xml
+ logFilePurger-spring.xml
+ mpeFieldgen-spring.xml
+ mpeHpeFilePurge-spring.xml
+ mpeLightningSrv-ingest.xml
+ mpeProcessGrib-spring.xml
+ ohdSetupService-spring.xml
+ pointDataRetrievel-spring.xml
+ q2FileProcessor-spring.xml
+ satpre-spring.xml
+ purge-logs.xml
+ fssobs-ingest.xml
+ fssobs-common.xml
+ ndm-ingest.xml
+
+
+
+ ohd-common-database.xml
+ ohd-common.xml
+ database-common.xml
+ ohd-request.xml
+ alertviz-request.xml
+ auth-common.xml
+ auth-request.xml
+ persist-request.xml
+ menus-request.xml
+ utility-request.xml
+ management-common.xml
+ management-request.xml
+ manualIngest-common.xml
+ manualIngest-request.xml
+ auth-request.xml
+ persist-request.xml
+ site-common.xml
+ site-request.xml
+ time-common.xml
+ units-common.xml
+ event-common.xml
+ eventbus-common.xml
+ edex-request.xml
+ request-service.xml
+ request-service-common.xml
+
+
+
+
+
+ utility-common.xml
+ geo-common.xml
+ time-common.xml
+ ffmp-ingest.xml
+ ffmp-common.xml
+ scan-ingest.xml
+ scan-common.xml
+ cwat-ingest.xml
+ cwat-common.xml
+ fog-ingest.xml
+ fog-common.xml
+ vil-ingest.xml
+ vil-common.xml
+ preciprate-ingest.xml
+ preciprate-common.xml
+ qpf-ingest.xml
+ qpf-common.xml
+ hydrodualpol-ingest.xml
+ cpgsrv-spring.xml
+ persist-ingest.xml
+ binlightning-common.xml
+ parameter-common.xml
+ gridcoverage-common.xml
+ grid-common.xml
+ database-common.xml
+ radar-common.xml
+ text-common.xml
+ level-common.xml
+ levelhandler-common.xml
+ pointdata-common.xml
+ bufrua-common.xml
+ shef-common.xml
+ satellite-common.xml
+ satellite-dataplugin-common.xml
+ ohd-common-database.xml
+ ohd-common.xml
+ management-common.xml
+ obs-common.xml
+ fssobs-ingest.xml
+ fssobs-common.xml
+ manualIngest-common.xml
+ dataaccess-common.xml
+ nctext-common.xml
+ statsTemplate
+
+
+
+
+
+ statsTemplate
+ database-common.xml
+ dataaccess-common.xml
+ time-common.xml
+ auth-common.xml
+ auth-request.xml
+ management-common.xml
+ event-common.xml
+ purge-logs.xml
+ ebxml.*\.xml
+ eventbus-common.xml
+ edex-security.xml
+ geo-common.xml
+ utility-request.xml
+ utility-common.xml
+ request-service
+
+
+
+ ebxmlRegistry
+ dataDeliveryTemplate
+ datadelivery-wfo-cron.xml
+ bandwidth-datadelivery-.*-wfo.xml
+ .*datadelivery.*-ncf.*
+ harvester-.*
+ crawler-.*
+
+
+
+ ebxmlRegistry
+ dataDeliveryTemplate
+ stats-ingest.xml
+ bandwidth-datadelivery-.*-ncf.xml
+ .*datadelivery.*-wfo.*
+
+
+
+ .*datadelivery.*
+ .*bandwidth.*
+ .*bandwidth.*-inmemory.*.xml
+ dpa-datadelivery.xml
+ satellite-common.xml
+ satellite-dataplugin-common.xml
+ goessounding-common.xml
+ grid-common.xml
+ grid-metadata.xml
+ gridcoverage-common.xml
+ parameter-common.xml
+ level-common.xml
+ levelhandler-common.xml
+ pointdata-common.xml
+ obs-common.xml
+ madis-common.xml
+ persist-ingest.xml
+
+
+
+ manualIngest*
+ time-common.xml
+ distribution-spring.xml
+ persist-ingest.xml
+ auth-common.xml
+ database-common.xml
+
+ datadelivery-handlers.xml
+ datadelivery-handlers-impl.xml
+ request-router.xml
+ ^utility-request.xml
+ dpa-datadelivery.xml
+ geo-common.xml
+ request-service.*
+ utility-common.xml
+ localization-http-request.xml
+
+ harvester-datadelivery-standalone.xml
+ datadelivery-standalone.xml
+
+ ogc-common.xml
+ wfs-ogc-request.xml
+ wfs-ogc-rest-request.xml
+ wfs-ogc-soap-request.xml
+ wfs-ogc-soap-wsdl.xml
+
+ purge-spring.xml
+ purge-spring-impl.xml
+ purge-logs.xml
+
+
+
+
+
+ dataProviderAgentTemplate
+ pointdata-common.xml
+ madis-common.xml
+ madis-ogc.xml
+ madis-ogc-registry.xml
+
+
+
+
+
+
+ bandwidth-datadelivery-inmemory-impl.xml
+ bandwidth-datadelivery.xml
+ bandwidth-datadelivery-wfo.xml
+
+
+
diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh
index 1d0ce43fb3..db0355fc89 100644
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@@ -210,6 +210,8 @@ if [ -d ${REPO_DEST} ]; then
fi
mkdir -p ${REPO_DEST}
+# The file awips2-builds/cave/build/features.txt contains a list of files to build
+
cp -v ${build_project_dir}/build.properties.p2 ${pde2_base_dir}/build.properties
for feature in `cat ${build_project_dir}/features.txt`; do
/awips2/java/bin/java -jar ${_pde_launcher_jar} -application org.eclipse.ant.core.antRunner \
@@ -239,10 +241,6 @@ for feature in `cat ${build_project_dir}/features.txt`; do
done
buildCAVEProduct ${awips_product} "awips2-cave"
-
buildRPMExec "Installer.cave-wrapper" ""
-
-buildCAVEProduct ${ncep_product} "awips2-cave-ncep"
-
-buildCAVEProduct ${gfeclient_product} "awips2-cave-gfeclient"
-
+#buildCAVEProduct ${ncep_product} "awips2-cave-ncep"
+#buildCAVEProduct ${gfeclient_product} "awips2-cave-gfeclient"