From 2baee319dee372fd29d51e620dc22e104f23ec66 Mon Sep 17 00:00:00 2001 From: Brian Clements Date: Wed, 28 May 2014 09:24:11 -0500 Subject: [PATCH] Omaha #3179 split modes.xml into plugin modes files Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a Former-commit-id: 334bb53dea4e6b35f7b98f338d2d3b3f9b32c153 [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8] Former-commit-id: 5e39a68498db19281f0ab2cd1085e6bc271abcbc --- edexOsgi/build.edex/esb/conf/modes/README.txt | 53 +++ edexOsgi/build.edex/esb/conf/modes/modes.xml | 438 ------------------ .../modes/dat-modes.xml | 84 ++++ .../modes/datadelivery-modes.xml | 123 +++++ .../modes/dpa-modes.xml | 81 ++++ .../modes/ogc-modes.xml | 34 ++ .../modes/hydro-modes.xml | 93 ++++ .../modes/grid-modes.xml | 48 ++ .../modes/ncep-modes.xml | 37 ++ 9 files changed, 553 insertions(+), 438 deletions(-) create mode 100644 edexOsgi/build.edex/esb/conf/modes/README.txt delete mode 100644 edexOsgi/build.edex/esb/conf/modes/modes.xml create mode 100644 edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.service/modes/datadelivery-modes.xml create mode 100644 edexOsgi/com.raytheon.uf.edex.dataprovideragent/modes/dpa-modes.xml create mode 100644 edexOsgi/com.raytheon.uf.edex.ogc.common/modes/ogc-modes.xml create mode 100644 edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml create mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml create mode 100644 ncep/gov.noaa.nws.ncep.edex.common/modes/ncep-modes.xml diff --git a/edexOsgi/build.edex/esb/conf/modes/README.txt b/edexOsgi/build.edex/esb/conf/modes/README.txt new file mode 100644 index 0000000000..db0257ce47 --- /dev/null +++ b/edexOsgi/build.edex/esb/conf/modes/README.txt @@ -0,0 +1,53 @@ + The EDEX services/capabilities are all registered/created through spring. + By including or excluding specific spring files we can determine at startup + which services the EDEX instance should start. + + If you provide no command line argument, EDEX will list available modes and exit. + + All modes files are merged at startup. Modes files with modes that have + the same name are combined so the end result is an aggregate of patterns + in all files. For example, the ingest mode has the base mode defined + in the ingest plug-in, but other plug-ins contribute excludes patterns. + The modes files in these plug-ins will also have a mode named 'ingest'. + The include and exclude tags should have regular expressions that + are compatible with Java's Pattern class. If you provide no + tag for a particular mode, the include defaults to .*. + + Each mode can define 0..n elements. + The mode then becomes the sum of all and tags + provided in all modes, including itself. + + The following xml attributes can be utilized to assist in + structuring the correct configuration: + + : + template="[true/false]", defaults to false, this is a non-bootable mode + + Template modes are not listed as available modes at startup. These modes are + only useful for being included in other modes. If any mode named 'foo' has + the template='true' attribute in any modes file, then the resulting aggregate + 'foo' mode will be a template non-bootable mode. + + e.g. + + + excludeFooFiles + excludeBarFiles + includeBazFiles + + + + .*foo.* + + + + .*bar.* + + + + .*baz.* + .*bazaar.* + diff --git a/edexOsgi/build.edex/esb/conf/modes/modes.xml b/edexOsgi/build.edex/esb/conf/modes/modes.xml deleted file mode 100644 index d33787e6a2..0000000000 --- a/edexOsgi/build.edex/esb/conf/modes/modes.xml +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - - - - .*request.* - .*common.* - excludeDpaAndOgc - - - webservices.xml - ebxml.*\.xml - .*request.* - grib-decode.xml - ncgrib-file-endpoint.xml - grid-staticdata-process.xml - .*datadelivery.* - .*bandwidth.* - excludeDpaAndOgc - obs-ingest-metarshef.xml - - aww-ingest.xml - ncscd-ingest.xml - ncpafm-ingest.xml - nctaf-ingest.xml - nctext-ingest.xml - ncuair-ingest.xml - ntrans-ingest.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 - .*sbn-simulator.* - - - 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 - 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 - - - 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 - nwsauth-request.xml - persist-request.xml - site-common.xml - site-request.xml - time-common.xml - units-common.xml - useradmin-common.xml - useradmin-request.xml - event-common.xml - eventbus-common.xml - edex-request.xml - - - time-common.xml - auth-common.xml - nwsauth-request.xml - grib-decode.xml - ncgrib-file-endpoint.xml - grid-staticdata-process.xml - level-common.xml - grid-common.xml - gridcoverage-common.xml - parameter-common.xml - persist-ingest.xml - management-common.xml - database-common.xml - event-ingest.xml - - h5uair-ingest.xml - h5uair-common.xml - h5scd-ingest.xml - - statsTemplate - excludeDpaAndOgc - - - - nwsauth-request.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 - 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 - auth-common.xml - obs-common.xml - fssobs-ingest.xml - fssobs-common.xml - ldadmesonet-common.xml - manualIngest-common.xml - dataaccess-common.xml - nctext-common.xml - excludeDpaAndOgc - statsTemplate - - - - ebxml.*\.xml - dataDeliveryTemplate - datadelivery-wfo-cron.xml - bandwidth-datadelivery-.*-wfo.xml - .*datadelivery.*-ncf.* - .*datadelivery.*-monolithic.* - harvester-* - crawler-* - - - - ebxml.*\.xml - dataDeliveryTemplate - bandwidth-datadelivery-.*-ncf.xml - .*datadelivery.*-wfo.* - .*datadelivery.*-monolithic.* - - - - event-common.xml - eventbus-common.xml - stats-common.xml - - - database-common.xml - .*datadelivery.* - .*bandwidth.* - - .*bandwidth.*-inmemory.*.xml - time-common.xml - auth-common.xml - nwsauth-request.xml - grid-common.xml - grid-metadata.xml - gridcoverage-common.xml - parameter-common.xml - pointdata-common.xml - obs-common.xml - madis-common.xml - level-common.xml - persist-ingest.xml - management-common.xml - event-ingest.xml - purge-logs.xml - - .*datadelivery-registry.* - - .*datadelivery-standalone.* - - statsTemplate - - - - .*dpa.* - - .*ogc.* - grid-metadata.xml - wxsrv-dataset-urn.xml - - - - bandwidth-datadelivery-inmemory-impl.xml - bandwidth-datadelivery.xml - bandwidth-datadelivery-wfo.xml - - - - ebxml.*\.xml - datadelivery-wfo-cron.xml - dataDeliveryTemplate - bandwidth-datadelivery-edex-impl-monolithic.xml - bandwidth-datadelivery-wfo.xml - .*datadelivery.*-ncf.* - - - .*sbn-simulator-wfo.* - event-common.xml - eventbus-common.xml - .*sbn-simulator-ncf.* - - - .*sbn-simulator-ncf.* - event-common.xml - eventbus-common.xml - .*sbn-simulator-wfo.* - - - grib-decode.xml - grid-staticdata-process.xml - grib-distribution.xml - level-common.xml - persist-ingest.xml - distribution-spring.xml - manualIngest-spring.xml - - - text-.* - textdb-.* - textdbsrv-.* - uengine-request.xml - auth-request.xml - distribution-spring.xml - manualIngest-spring.xml - - - .*gfe.* - serialize-request.xml - level-spring.xml - distribution-spring.xml - manualIngest-spring.xml - - - ebxml.*\.xml - alarmWhfs-spring.xml - arealffgGenerator-spring.xml - DPADecoder-spring.xml - dqcPreprocessor-spring.xml - floodArchiver-spring.xml - hpeDHRDecoder-spring.xml - ohd.*.xml - ihfsDbPurge-spring.xml - logFilePurger-spring.xml - mpeFieldgen-spring.xml - mpeHpeFilePurge-spring.xml - mpeProcessGrib-spring.xml - ohdSetupService-spring.xml - pointDataRetrievel-spring.xml - q2FileProcessor-spring.xml - satpre-spring.xml - .*sbn-simulator.* - - - auth-request.xml - utility-request.xml - - - .*datadelivery-standalone.* - .*datadelivery-registry.* - datadeliverytemplate - - - manualIngest* - time-common.xml - distribution-spring.xml - persist-ingest.xml - auth-common.xml - database-common.xml - - datadelivery-standalone.xml - datadelivery-handlers.xml - datadelivery-handlers-impl.xml - request-router.xml - utility-request.xml - dpa-datadelivery.xml - - harvester-datadelivery-standalone.xml - - - ogc-common.xml - .*-ogc-request.xml - .*-ogc-rest-request.xml - .*-ogc-soap-request.xml - .*-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 - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml new file mode 100644 index 0000000000..474a53e694 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml @@ -0,0 +1,84 @@ + + + + + + + + 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 + + + + nwsauth-request.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 + 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 + auth-common.xml + obs-common.xml + fssobs-ingest.xml + fssobs-common.xml + ldadmesonet-common.xml + manualIngest-common.xml + dataaccess-common.xml + nctext-common.xml + statsTemplate + + diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/modes/datadelivery-modes.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/modes/datadelivery-modes.xml new file mode 100644 index 0000000000..310da5f98e --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/modes/datadelivery-modes.xml @@ -0,0 +1,123 @@ + + + + + + + grid-metadata.xml + + + webservices.xml + ebxml.*\.xml + .*datadelivery.* + .*bandwidth.* + .*sbn-simulator.* + grid-metadata.xml + + + + ebxml.*\.xml + dataDeliveryTemplate + datadelivery-wfo-cron.xml + bandwidth-datadelivery-.*-wfo.xml + .*datadelivery.*-ncf.* + .*datadelivery.*-monolithic.* + harvester-* + crawler-* + + + + ebxml.*\.xml + dataDeliveryTemplate + bandwidth-datadelivery-.*-ncf.xml + .*datadelivery.*-wfo.* + .*datadelivery.*-monolithic.* + + + database-common.xml + .*datadelivery.* + .*bandwidth.* + + .*bandwidth.*-inmemory.*.xml + time-common.xml + auth-common.xml + nwsauth-request.xml + grid-common.xml + grid-metadata.xml + gridcoverage-common.xml + parameter-common.xml + pointdata-common.xml + obs-common.xml + madis-common.xml + level-common.xml + persist-ingest.xml + management-common.xml + event-ingest.xml + purge-logs.xml + + .*datadelivery-registry.* + + .*datadelivery-standalone.* + + statsTemplate + + + + bandwidth-datadelivery-inmemory-impl.xml + bandwidth-datadelivery.xml + bandwidth-datadelivery-wfo.xml + + + + ebxml.*\.xml + datadelivery-wfo-cron.xml + dataDeliveryTemplate + bandwidth-datadelivery-edex-impl-monolithic.xml + bandwidth-datadelivery-wfo.xml + .*datadelivery.*-ncf.* + + + .*sbn-simulator-wfo.* + event-common.xml + eventbus-common.xml + .*sbn-simulator-ncf.* + + + .*sbn-simulator-ncf.* + event-common.xml + eventbus-common.xml + .*sbn-simulator-wfo.* + + + .*datadelivery-standalone.* + .*datadelivery-registry.* + dataDeliveryTemplate + + diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent/modes/dpa-modes.xml b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/modes/dpa-modes.xml new file mode 100644 index 0000000000..f66df0cf42 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/modes/dpa-modes.xml @@ -0,0 +1,81 @@ + + + + + + + + .*dpa.* + + + + .*dpa.* + + + manualIngest* + time-common.xml + distribution-spring.xml + persist-ingest.xml + auth-common.xml + database-common.xml + + datadelivery-standalone.xml + datadelivery-handlers.xml + datadelivery-handlers-impl.xml + request-router.xml + utility-request.xml + dpa-datadelivery.xml + + harvester-datadelivery-standalone.xml + + + ogc-common.xml + .*-ogc-request.xml + .*-ogc-rest-request.xml + .*-ogc-soap-request.xml + .*-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 + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/modes/ogc-modes.xml b/edexOsgi/com.raytheon.uf.edex.ogc.common/modes/ogc-modes.xml new file mode 100644 index 0000000000..b9beea83e7 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.ogc.common/modes/ogc-modes.xml @@ -0,0 +1,34 @@ + + + + + + + + .*ogc.* + + + + .*ogc.* + + diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml b/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml new file mode 100644 index 0000000000..49022d5405 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml @@ -0,0 +1,93 @@ + + + + + + + + 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 + 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 + + + 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 + nwsauth-request.xml + persist-request.xml + site-common.xml + site-request.xml + time-common.xml + units-common.xml + useradmin-common.xml + useradmin-request.xml + event-common.xml + eventbus-common.xml + edex-request.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 new file mode 100644 index 0000000000..948b3c1288 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml @@ -0,0 +1,48 @@ + + + + + + + grib-decode.xml + ncgrib-file-endpoint.xml + grid-staticdata-process.xml + + + time-common.xml + auth-common.xml + nwsauth-request.xml + grib-decode.xml + ncgrib-file-endpoint.xml + grid-staticdata-process.xml + level-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/ncep/gov.noaa.nws.ncep.edex.common/modes/ncep-modes.xml b/ncep/gov.noaa.nws.ncep.edex.common/modes/ncep-modes.xml new file mode 100644 index 0000000000..c8c889e745 --- /dev/null +++ b/ncep/gov.noaa.nws.ncep.edex.common/modes/ncep-modes.xml @@ -0,0 +1,37 @@ + + + + + + + + aww-ingest.xml + ncscd-ingest.xml + ncpafm-ingest.xml + nctaf-ingest.xml + nctext-ingest.xml + ncuair-ingest.xml + ntrans-ingest.xml + + +