Merge branch 'unidata_18.1.1' of github.com:Unidata/awips2 into unidata_18.1.1-osx

This commit is contained in:
Michael James 2018-08-01 13:55:39 -06:00
commit 888a909399
18 changed files with 382 additions and 275 deletions

View file

@ -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

View file

@ -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
#

View file

@ -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/*

View file

@ -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

View file

@ -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

View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.raytheon.uf.viz.dat.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

View file

@ -0,0 +1 @@
bin.includes = feature.xml

View file

@ -0,0 +1 @@
bin.includes = feature.xml

View file

@ -123,6 +123,19 @@
<feature id="com.raytheon.uf.viz.ncep.perspective.feature"/>
<feature id="com.raytheon.uf.viz.d2d.skewt.feature"/>
<feature id="com.raytheon.uf.viz.server.edex.feature"/>
<feature id="com.raytheon.uf.viz.dat.feature"/>
<feature id="com.raytheon.uf.viz.datadelivery.feature"/>
<feature id="edu.wisc.ssec.cimss.viz.convectprob.feature"/>
<feature id="gov.noaa.nws.mdl.viz.boundaryTool.common.feature"/>
<feature id="com.raytheon.uf.viz.satellite.goesr.feature"/>
<feature id="com.raytheon.uf.viz.ohd.feature"/>
<feature id="com.raytheon.uf.viz.scan.feature"/>
<feature id="edu.ucar.unidata.uf.viz.feature"/>
<feature id="gov.noaa.nws.ncep.swpc.viz.feature"/>
<feature id="gov.noaa.nws.ocp.uf.viz.gisdatastore.feature"/>
<feature id="gov.noaa.nws.ocp.viz.climate.feature"/>
<feature id="gov.noaa.nws.ocp.viz.firewx.feature"/>
<feature id="gov.noaa.nws.ocp.viz.psh.feature"/>
</features>
<configurations>

1
dist/comps.xml vendored
View file

@ -195,7 +195,6 @@
<packagereq type="default">awips2-edex-dat</packagereq>
<packagereq type="default">awips2-edex-datadelivery</packagereq>
<packagereq type="default">awips2-edex-hazards</packagereq>
<packagereq type="default">awips2-edex-ohd</packagereq>
<packagereq type="default">awips2-edex-ogc</packagereq>
<!-- <packagereq type="default">awips2-edex-swpc</packagereq> -->
<packagereq type="default">awips2-hydroapps</packagereq>

View file

@ -1,86 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
Refer to edex/modes/README.txt for documentation
-->
<edexModes>
<mode name="ingest">
<!-- exclude DAT -->
<exclude>ffmp-ingest.xml</exclude>
<exclude>scan-ingest.xml</exclude>
<exclude>cwat-ingest.xml</exclude>
<exclude>fog-ingest.xml</exclude>
<exclude>vil-ingest.xml</exclude>
<exclude>preciprate-ingest.xml</exclude>
<exclude>qpf-ingest.xml</exclude>
<exclude>fssobs-ingest.xml</exclude>
<exclude>cpgsrv-spring.xml</exclude>
</mode>
<!-- Runs separate now, not just high mem -->
<mode name="ingestDat">
<!-- utility-common needed for localization notifications -->
<include>utility-common.xml</include>
<!-- geo-common needed for thrift adapter registration -->
<include>geo-common.xml</include>
<include>time-common.xml</include>
<include>ffmp-ingest.xml</include>
<include>ffmp-common.xml</include>
<include>scan-ingest.xml</include>
<include>scan-common.xml</include>
<include>cwat-ingest.xml</include>
<include>cwat-common.xml</include>
<include>fog-ingest.xml</include>
<include>fog-common.xml</include>
<include>vil-ingest.xml</include>
<include>vil-common.xml</include>
<include>preciprate-ingest.xml</include>
<include>preciprate-common.xml</include>
<include>qpf-ingest.xml</include>
<include>qpf-common.xml</include>
<include>cpgsrv-spring.xml</include>
<include>persist-ingest.xml</include>
<include>binlightning-common.xml</include>
<include>parameter-common.xml</include>
<include>gridcoverage-common.xml</include>
<include>grid-common.xml</include>
<include>database-common.xml</include>
<include>radar-common.xml</include>
<include>text-common.xml</include>
<include>level-common.xml</include>
<include>levelhandler-common.xml</include>
<include>pointdata-common.xml</include>
<include>bufrua-common.xml</include>
<include>shef-common.xml</include>
<include>satellite-common.xml</include>
<include>satellite-dataplugin-common.xml</include>
<include>ohd-common-database.xml</include>
<include>ohd-common.xml</include>
<include>management-common.xml</include>
<include>obs-common.xml</include>
<include>fssobs-ingest.xml</include>
<include>fssobs-common.xml</include>
<include>manualIngest-common.xml</include>
<include>dataaccess-common.xml</include>
<exclude>nctext-common.xml</exclude>
<includeMode>statsTemplate</includeMode>
</mode>
</edexModes>

View file

@ -1,95 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
Refer to edex/modes/README.txt for documentation
-->
<edexModes>
<!-- this file is specifically for ALR/SJU -->
<mode name="ingest">
<exclude>obs-ingest-metarshef.xml</exclude>
</mode>
<mode name="ingestHydro">
<include>distribution-spring.xml</include>
<include>manualIngest-common.xml</include>
<include>manualIngest-spring.xml</include>
<include>shef-ingest.xml</include>
<include>persist-ingest.xml</include>
<include>obs-common.xml</include>
<include>obs-ingest.xml</include>
<include>obs-ingest-metarshef.xml</include>
<include>metartohmdb-plugin.xml</include>
<include>metartoclimate-plugin.xml</include>
<include>pointdata-common.xml</include>
<include>shef-common.xml</include>
<include>ohd-common-database.xml</include>
<include>ohd-common.xml</include>
<include>alarmWhfs-spring.xml</include>
<include>arealffgGenerator-spring.xml</include>
<include>arealQpeGen-spring.xml</include>
<include>DPADecoder-spring.xml</include>
<include>dqcPreprocessor-spring.xml</include>
<include>floodArchiver-spring.xml</include>
<include>freezingLevel-spring.xml</include>
<include>hpeDHRDecoder-spring.xml</include>
<include>ihfsDbPurge-spring.xml</include>
<include>logFilePurger-spring.xml</include>
<include>mpeFieldgen-spring.xml</include>
<include>mpeHpeFilePurge-spring.xml</include>
<include>mpeLightningSrv-ingest.xml</include>
<include>mpeProcessGrib-spring.xml</include>
<include>ohdSetupService-spring.xml</include>
<include>pointDataRetrievel-spring.xml</include>
<include>q2FileProcessor-spring.xml</include>
<include>satpre-spring.xml</include>
<include>purge-logs.xml</include>
<exclude>fssobs-ingest.xml</exclude>
<exclude>fssobs-common.xml</exclude>
<include>ndm-ingest.xml</include>
</mode>
<mode name="requestHydro">
<include>ohd-common-database.xml</include>
<include>ohd-common.xml</include>
<include>database-common.xml</include>
<include>ohd-request.xml</include>
<include>alertviz-request.xml</include>
<include>auth-common.xml</include>
<include>auth-request.xml</include>
<include>persist-request.xml</include>
<include>menus-request.xml</include>
<include>utility-request.xml</include>
<include>management-common.xml</include>
<include>management-request.xml</include>
<include>manualIngest-common.xml</include>
<include>manualIngest-request.xml</include>
<include>auth-request.xml</include>
<include>persist-request.xml</include>
<include>site-common.xml</include>
<include>site-request.xml</include>
<include>time-common.xml</include>
<include>units-common.xml</include>
<include>event-common.xml</include>
<include>eventbus-common.xml</include>
<include>edex-request.xml</include>
<include>request-service.xml</include>
<include>request-service-common.xml</include>
</mode>
</edexModes>

View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Refer to edex/modes/README.txt for documentation -->
<edexModes>
<mode name="ingest">
<exclude>grib-decode.xml</exclude>
<exclude>grid-staticdata-process.xml</exclude>
</mode>
<mode name="ingestGrib">
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>python-common.xml</include>
<include>grib-decode.xml</include>
<include>grid-staticdata-process.xml</include>
<include>level-common.xml</include>
<include>levelhandler-common.xml</include>
<include>grid-common.xml</include>
<include>gridcoverage-common.xml</include>
<include>parameter-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>
<include>database-common.xml</include>
<include>event-ingest.xml</include>
<includeMode>statsTemplate</includeMode>
</mode>
</edexModes>

View file

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!--
Refer to edex/modes/README.txt for documentation
-->
<edexModes>
<mode name="ingest">
<exclude>ebxml.*\.xml</exclude>
</mode>
<mode name="ebxmlRegistry" template="true">
<includeMode>statsTemplate</includeMode>
<include>database-common.xml</include>
<include>dataaccess-common.xml</include>
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>auth-request.xml</include>
<include>management-common.xml</include>
<include>event-common.xml</include>
<include>purge-logs.xml</include>
<include>ebxml.*\.xml</include>
<include>eventbus-common.xml</include>
<include>edex-security.xml</include>
<include>geo-common.xml</include>
<include>utility-request.xml</include>
<include>utility-common.xml</include>
<include>request-service</include>
</mode>
<mode name="registry">
<includeMode>ebxmlRegistry</includeMode>
</mode>
<mode name="centralRegistry">
<!-- Central Registry production mode -->
<includeMode>ebxmlRegistry</includeMode>
<include>stats-ingest.xml</include>
</mode>
</edexModes>

View file

@ -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=
ebxml-webserver-ip-blacklist=

View file

@ -0,0 +1,328 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
Refer to edex/modes/README.txt for documentation
-->
<edexModes>
<mode name="ingest">
<exclude>.*request.*</exclude>
<exclude>edex-security.xml</exclude>
<exclude>ebxml.*\.xml</exclude>
<exclude>grib-decode.xml</exclude>
<exclude>grid-staticdata-process.xml</exclude>
<exclude>.*(dpa|taf|nctext).*</exclude>
<exclude>webservices.xml</exclude>
<exclude>ebxml.*\.xml</exclude>
<exclude>.*datadelivery.*</exclude>
<exclude>.*bandwidth.*</exclude>
<exclude>.*sbn-simulator.*</exclude>
<exclude>hydrodualpol-ingest.xml</exclude>
<exclude>grid-metadata.xml</exclude>
<exclude>.*ogc.*</exclude>
<exclude>obs-ingest-metarshef.xml</exclude>
<exclude>ffmp-ingest.xml</exclude>
<exclude>scan-ingest.xml</exclude>
<exclude>cwat-ingest.xml</exclude>
<exclude>fog-ingest.xml</exclude>
<exclude>vil-ingest.xml</exclude>
<exclude>preciprate-ingest.xml</exclude>
<exclude>qpf-ingest.xml</exclude>
<exclude>fssobs-ingest.xml</exclude>
<exclude>cpgsrv-spring.xml</exclude>
</mode>
<mode name="ingestGrib">
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>python-common.xml</include>
<include>grib-decode.xml</include>
<include>grid-staticdata-process.xml</include>
<include>level-common.xml</include>
<include>levelhandler-common.xml</include>
<include>grid-common.xml</include>
<include>gridcoverage-common.xml</include>
<include>parameter-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>
<include>database-common.xml</include>
<include>event-ingest.xml</include>
<includeMode>statsTemplate</includeMode>
</mode>
<mode name="request">
<include>.*request.*</include>
<include>.*common.*</include>
<exclude>grid-metadata.xml</exclude>
<exclude>event-datadelivery-common.xml</exclude>
<exclude>.*ogc.*</exclude>
<exclude>.*dpa.*</exclude>
</mode>
<mode name="ingestRadar">
<includeMode>ingest</includeMode>
<includeMode>pluginExclude</includeMode>
<includeMode>goesrExclude</includeMode>
<exclude>.*(airmet|atcf|aww|convsigmet|gfe|grid|hydro|intlsigmet|modis|ncpafm|ncuair|profiler|netcdf-grid).*</exclude>
<exclude>.*(nonconvsigmet|satellite|sgwh|ssha|stats|stormtrack|textlightning_ep|useradmin|wcp).*</exclude>
</mode>
<mode name="ingestGoesR">
<includeMode>ingest</includeMode>
<includeMode>pluginExclude</includeMode>
<includeMode>radarExclude</includeMode>
</mode>
<mode name="ingestGrids">
<includeMode>ingest</includeMode>
<includeMode>pluginExclude</includeMode>
<includeMode>radarExclude</includeMode>
<includeMode>goesrExclude</includeMode>
</mode>
<mode name="pluginExclude">
<exclude>^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lsr|modelsounding|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*</exclude>
</mode>
<mode name="goesrExclude">
<exclude>^(binlightning|dmw|goesr|glm).*</exclude>
</mode>
<mode name="radarExclude">
<exclude>^radar.*</exclude>
</mode>
<mode name="statsTemplate" template="true">
<include>event-common.xml</include>
<include>eventbus-common.xml</include>
<include>stats-common.xml</include>
</mode>
<!-- HYDRO SERVER -->
<mode name="ingestHydro">
<include>distribution-spring.xml</include>
<include>manualIngest-common.xml</include>
<include>manualIngest-spring.xml</include>
<include>shef-ingest.xml</include>
<include>persist-ingest.xml</include>
<include>obs-common.xml</include>
<include>obs-ingest.xml</include>
<include>obs-ingest-metarshef.xml</include>
<include>metartohmdb-plugin.xml</include>
<include>metartoclimate-plugin.xml</include>
<include>pointdata-common.xml</include>
<include>shef-common.xml</include>
<include>ohd-common-database.xml</include>
<include>ohd-common.xml</include>
<include>alarmWhfs-spring.xml</include>
<include>arealffgGenerator-spring.xml</include>
<include>arealQpeGen-spring.xml</include>
<include>DPADecoder-spring.xml</include>
<include>dqcPreprocessor-spring.xml</include>
<include>floodArchiver-spring.xml</include>
<include>freezingLevel-spring.xml</include>
<include>hpeDHRDecoder-spring.xml</include>
<include>ihfsDbPurge-spring.xml</include>
<include>logFilePurger-spring.xml</include>
<include>mpeFieldgen-spring.xml</include>
<include>mpeHpeFilePurge-spring.xml</include>
<include>mpeLightningSrv-ingest.xml</include>
<include>mpeProcessGrib-spring.xml</include>
<include>ohdSetupService-spring.xml</include>
<include>pointDataRetrievel-spring.xml</include>
<include>q2FileProcessor-spring.xml</include>
<include>satpre-spring.xml</include>
<include>purge-logs.xml</include>
<exclude>fssobs-ingest.xml</exclude>
<exclude>fssobs-common.xml</exclude>
<include>ndm-ingest.xml</include>
</mode>
<mode name="requestHydro">
<include>ohd-common-database.xml</include>
<include>ohd-common.xml</include>
<include>database-common.xml</include>
<include>ohd-request.xml</include>
<include>alertviz-request.xml</include>
<include>auth-common.xml</include>
<include>auth-request.xml</include>
<include>persist-request.xml</include>
<include>menus-request.xml</include>
<include>utility-request.xml</include>
<include>management-common.xml</include>
<include>management-request.xml</include>
<include>manualIngest-common.xml</include>
<include>manualIngest-request.xml</include>
<include>auth-request.xml</include>
<include>persist-request.xml</include>
<include>site-common.xml</include>
<include>site-request.xml</include>
<include>time-common.xml</include>
<include>units-common.xml</include>
<include>event-common.xml</include>
<include>eventbus-common.xml</include>
<include>edex-request.xml</include>
<include>request-service.xml</include>
<include>request-service-common.xml</include>
</mode>
<!-- DECISION ASSITANCE TOOLS -->
<mode name="ingestDat">
<include>utility-common.xml</include>
<include>geo-common.xml</include>
<include>time-common.xml</include>
<include>ffmp-ingest.xml</include>
<include>ffmp-common.xml</include>
<include>scan-ingest.xml</include>
<include>scan-common.xml</include>
<include>cwat-ingest.xml</include>
<include>cwat-common.xml</include>
<include>fog-ingest.xml</include>
<include>fog-common.xml</include>
<include>vil-ingest.xml</include>
<include>vil-common.xml</include>
<include>preciprate-ingest.xml</include>
<include>preciprate-common.xml</include>
<include>qpf-ingest.xml</include>
<include>qpf-common.xml</include>
<include>hydrodualpol-ingest.xml</include>
<include>cpgsrv-spring.xml</include>
<include>persist-ingest.xml</include>
<include>binlightning-common.xml</include>
<include>parameter-common.xml</include>
<include>gridcoverage-common.xml</include>
<include>grid-common.xml</include>
<include>database-common.xml</include>
<include>radar-common.xml</include>
<include>text-common.xml</include>
<include>level-common.xml</include>
<include>levelhandler-common.xml</include>
<include>pointdata-common.xml</include>
<include>bufrua-common.xml</include>
<include>shef-common.xml</include>
<include>satellite-common.xml</include>
<include>satellite-dataplugin-common.xml</include>
<include>ohd-common-database.xml</include>
<include>ohd-common.xml</include>
<include>management-common.xml</include>
<include>obs-common.xml</include>
<include>fssobs-ingest.xml</include>
<include>fssobs-common.xml</include>
<include>manualIngest-common.xml</include>
<include>dataaccess-common.xml</include>
<exclude>nctext-common.xml</exclude>
<includeMode>statsTemplate</includeMode>
</mode>
<!-- EBXML REGISTRY / DATA DELIVERY -->
<mode name="ebxmlRegistry" template="true">
<includeMode>statsTemplate</includeMode>
<include>database-common.xml</include>
<include>dataaccess-common.xml</include>
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>auth-request.xml</include>
<include>management-common.xml</include>
<include>event-common.xml</include>
<include>purge-logs.xml</include>
<include>ebxml.*\.xml</include>
<include>eventbus-common.xml</include>
<include>edex-security.xml</include>
<include>geo-common.xml</include>
<include>utility-request.xml</include>
<include>utility-common.xml</include>
<include>request-service</include>
</mode>
<mode name="registry">
<includeMode>ebxmlRegistry</includeMode>
<includeMode>dataDeliveryTemplate</includeMode>
<include>datadelivery-wfo-cron.xml</include>
<include>bandwidth-datadelivery-.*-wfo.xml</include>
<exclude>.*datadelivery.*-ncf.*</exclude>
<exclude>harvester-.*</exclude>
<exclude>crawler-.*</exclude>
</mode>
<mode name="centralRegistry">
<includeMode>ebxmlRegistry</includeMode>
<includeMode>dataDeliveryTemplate</includeMode>
<include>stats-ingest.xml</include>
<include>bandwidth-datadelivery-.*-ncf.xml</include>
<exclude>.*datadelivery.*-wfo.*</exclude>
</mode>
<mode name="dataDeliveryTemplate" template="true">
<include>.*datadelivery.*</include>
<include>.*bandwidth.*</include>
<exclude>.*bandwidth.*-inmemory.*.xml</exclude>
<exclude>dpa-datadelivery.xml</exclude>
<include>satellite-common.xml</include>
<include>satellite-dataplugin-common.xml</include>
<include>goessounding-common.xml</include>
<include>grid-common.xml</include>
<include>grid-metadata.xml</include>
<include>gridcoverage-common.xml</include>
<include>parameter-common.xml</include>
<include>level-common.xml</include>
<include>levelhandler-common.xml</include>
<include>pointdata-common.xml</include>
<include>obs-common.xml</include>
<include>madis-common.xml</include>
<include>persist-ingest.xml</include>
</mode>
<mode name="dataProviderAgentTemplate" template="true">
<include>manualIngest*</include>
<include>time-common.xml</include>
<include>distribution-spring.xml</include>
<include>persist-ingest.xml</include>
<include>auth-common.xml</include>
<include>database-common.xml</include>
<!-- Remote connect to registry services -->
<include>datadelivery-handlers.xml</include>
<include>datadelivery-handlers-impl.xml</include>
<include>request-router.xml</include>
<include>^utility-request.xml</include>
<include>dpa-datadelivery.xml</include>
<include>geo-common.xml</include>
<include>request-service.*</include>
<include>utility-common.xml</include>
<include>localization-http-request.xml</include>
<!-- Don't want this for DPA, we don't need a local registry -->
<exclude>harvester-datadelivery-standalone.xml</exclude>
<exclude>datadelivery-standalone.xml</exclude>
<!-- OGC/DPA services -->
<include>ogc-common.xml</include>
<include>wfs-ogc-request.xml</include>
<include>wfs-ogc-rest-request.xml</include>
<include>wfs-ogc-soap-request.xml</include>
<include>wfs-ogc-soap-wsdl.xml</include>
<!-- Purge OGC/DPA registred plugins -->
<include>purge-spring.xml</include>
<include>purge-spring-impl.xml</include>
<include>purge-logs.xml</include>
</mode>
<!-- MADIS implmentation of dataprovideragent -->
<mode name="dataprovideragent">
<includeMode>dataProviderAgentTemplate</includeMode>
<include>pointdata-common.xml</include>
<include>madis-common.xml</include>
<include>madis-ogc.xml</include>
<include>madis-ogc-registry.xml</include>
</mode>
<!-- Utilized by BandwidthUtil for creating an in memory bandwidth manager -->
<mode name="inMemoryBandwidthManager">
<!-- This is not an edex runtime mode and is used in memory -->
<include>bandwidth-datadelivery-inmemory-impl.xml</include>
<include>bandwidth-datadelivery.xml</include>
<include>bandwidth-datadelivery-wfo.xml</include>
</mode>
</edexModes>

View file

@ -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"