Commit graph

138 commits

Author SHA1 Message Date
Richard Peter
8fda9e8567 Merge "Issue #1350: Track ingestGrib and ingestDat statistics" into development
Former-commit-id: 43991f57fd [formerly 5c398cb93f] [formerly 53426e2e90] [formerly 9a90b123e7 [formerly 53426e2e90 [formerly 08b5d690e71afd7424fc00e0d4c06b497447d93a]]]
Former-commit-id: 9a90b123e7
Former-commit-id: 6f95475db39ab5699bac720819dccad18b1a1b0a [formerly a7d31535da]
Former-commit-id: 88602c16f4
2012-11-26 18:15:21 -06:00
Richard Peter
998a26d5d8 Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 797b0bb4e8 [formerly 0db7ec08a2] [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 8d40a8fea9 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: c48e3deb2d581da3a86dbbdebf380436a997b65b [formerly b891bb63e1]
Former-commit-id: d1d28437ad
2012-11-26 18:13:13 -06:00
Bryan Kowal
d0a39600a7 Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0

Former-commit-id: e0ca63881a [formerly 95efa5f0e0] [formerly 06241d95e0] [formerly f645f60a75 [formerly 06241d95e0 [formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]]
Former-commit-id: f645f60a75
Former-commit-id: 3f8d5a84c32d9b2062047b003a880195b829a06a [formerly f68c9873b7]
Former-commit-id: 87e0c08179
2012-11-26 13:06:33 -06:00
Dustin Johnson
add45e6805 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly a9d01486ed [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: c8e8f27647ef18ecfbb5e4b6ae6a9f36c8133dea [formerly 1bb69653af]
Former-commit-id: dd03bf9bd5
2012-11-19 13:21:03 -06:00
Dustin Johnson
f661846a65 Issue #1322 Fix ingestGrib modes.xml to include router spring file
Amend:
  Add correct bean name.

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: 8ec80021c2 [formerly 9cfb406675] [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly ea7e8ac946 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]]
Former-commit-id: 63db1ce6f8
Former-commit-id: bab3f53f7731061ffcaf6c4adb70871624655bfa [formerly 56ea981db7]
Former-commit-id: 75feca3cd0
2012-11-19 12:03:31 -06:00
Dustin Johnson
9b9f41cb5a Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]
Former-commit-id: a448369b44
2012-11-16 14:43:45 -06:00
Ben Steffensmeier
4135b1ad21 Issue #189 fix modes for gridcoverage to include converter registration
Former-commit-id: 27f6224e91 [formerly 1082b1b51d] [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 1a7560b8a3 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 0225fcc4d96c0f4eb7101fbb5dc6255eb318fcbc [formerly 2a0769d094]
Former-commit-id: 5126024a6b
2012-11-16 12:25:00 -06:00
Benjamin Phillippe
41647b0274 Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 1fa596463d [formerly 44519995ee] [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 5bf46d468d [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]
Former-commit-id: 5c31b34e12
Former-commit-id: d2f70d8685a2cd0f6ca4f66510f619573250a39a [formerly 6b1b73429b]
Former-commit-id: 43b94988c8
2012-11-15 13:35:25 -06:00
Dustin Johnson
08fd67e94a Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]
Former-commit-id: 5d5dbe27e1
2012-11-14 14:41:57 -06:00
Steve Harris
4300583fc2 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]
Former-commit-id: e35a321a8c
2012-11-14 14:19:20 -06:00
Dustin Johnson
21dc859b85 Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 7d9e7567bd [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: caae98dd9803817a99d22d4cbbe38eccdaeff2f9 [formerly c0c60c2488]
Former-commit-id: 5d410ff934
2012-11-14 12:19:10 -06:00
Brad Gonzales
e092183f27 Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: de29d9feba [formerly 782ffb92ea] [formerly 4af27e092f] [formerly 1617341e2a [formerly 4af27e092f [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]
Former-commit-id: 1617341e2a
Former-commit-id: f8f796be57c18271c59de81d8c886b4407b52ee5 [formerly c024c94050]
Former-commit-id: cc8ed35821
2012-11-14 09:39:26 -06:00
Steve Harris
98670f1cc2 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]
Former-commit-id: 21ecd53719
2012-11-13 17:28:50 -06:00
Steve Harris
5f628acefd 12.12.1-3 baseline
Former-commit-id: 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly b3b5e6d28f [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: b188535ef6619becad681ca44d5bacd7a27bb351 [formerly 2797cbcdd0]
Former-commit-id: 2e3662028f
2012-11-13 17:27:04 -06:00
Ben Steffensmeier
fa599c93a8 Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]
Former-commit-id: 109ec1e778
2012-11-13 16:00:19 -06:00
Ben Steffensmeier
0f58b01a58 Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: a0f6c320cb [formerly 20e618eb4f] [formerly 535c73051d] [formerly 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 0198876d17ad6ff76ff77ca6660a268c711628d2 [formerly 884c82c4fe]
Former-commit-id: 7c93db759c
2012-11-08 14:45:36 -06:00
Nate Jensen
19b0afefc5 Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: b0bb920fde [formerly 20a63254e2] [formerly b32a9e839e] [formerly 6b205399d4 [formerly b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]
Former-commit-id: 6b205399d4
Former-commit-id: 04ac668436ffe2114a4379e6e35db8978db0e543 [formerly e3208d48a0]
Former-commit-id: 2fe69a5871
2012-11-07 18:18:06 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
2012-11-07 12:41:20 -06:00
Max Schenkelberg
f9e6347863 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 11111d3a29cb179e3e47566262a8a2be05fd32e6 [formerly 2f90120248]] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]
Former-commit-id: 5a5bd522a1
2012-11-07 10:44:42 -06:00
Bryan Kowal
4f02bbc98e Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: 7ecbbdfdbb [formerly cae04523db] [formerly 9263a0ac57] [formerly 4fd43ee45c [formerly 9263a0ac57 [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]]
Former-commit-id: 4fd43ee45c
Former-commit-id: 16e7831852267916f15c8ff6963b429fd72ee1c5 [formerly 2c14ea1bb7]
Former-commit-id: d928e2f257
2012-11-06 16:13:26 -06:00
Dustin Johnson
feb6c540b8 Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: a03d79bbf0 [formerly 8d5c86f31e] [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 2f28e19bf6 [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 8eeb213e5becb7f3d249c38ca4c6b67ae70efd03 [formerly 7f994472ae]
Former-commit-id: 7b4967b5bb
2012-11-01 16:31:14 -05:00
Dustin Johnson
fe8a2a3b09 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
2012-11-01 13:36:06 -05:00
Brad Gonzales
3cb105f035 Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 6efd4a8ef1 [formerly 449e4a2182] [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 9137f334b5 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]]
Former-commit-id: 20a5fe3577
Former-commit-id: 12a54c89b4924eac0f51595caec90cee14395903 [formerly 2ffcd5d684]
Former-commit-id: 4ffe05d37e
2012-11-01 11:02:48 -05:00
Brad Gonzales
675a6f6b05 Issue #1274 Added Token control for java code and scripts started by RFC Crons.
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 0a60448e8f [formerly 75e77feb58] [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 68a3a98547 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]]
Former-commit-id: 44e9238fa9
Former-commit-id: 62ae708ea7ab6aae87f7de0577fa4c1f706252c9 [formerly 253c19ae05]
Former-commit-id: 7807eca270
2012-10-31 21:20:40 -05:00
Ben Steffensmeier
0ee5726a56 merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]
Former-commit-id: 1d94435220
2012-10-30 12:24:54 -05:00
Brad Gonzales
ff6f910a9d Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: 1ba2a25bce [formerly d26119c383] [formerly b2656df2f8] [formerly 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: ddba220564f0c36e18583d0653bc164afe5c183b [formerly 5949c8b09c]
Former-commit-id: 781265a6a8
2012-10-26 14:00:55 -05:00
Ben Steffensmeier
a02048de74 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 12eb4c8246 [formerly 7734a983f5] [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: e669b6159338d2ec7600fa9890fb7e959ebc9cec [formerly 54f414a7e0]
Former-commit-id: 45cc834fc3
2012-10-25 16:17:54 -05:00
Ben Steffensmeier
24de750932 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]
Former-commit-id: 9b8f2bcdbd
2012-10-25 12:22:11 -05:00
Nate Jensen
22da6ba521 Merge "Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run" into development
Former-commit-id: b015b04d5e [formerly 409da6ad67] [formerly c70d361f2d] [formerly 73bc74d3d5 [formerly c70d361f2d [formerly e032f584ec1caa3c9c973d554123678f828791a7]]]
Former-commit-id: 73bc74d3d5
Former-commit-id: b6f9a8fccb244ee06b0574fc21013eca6108a869 [formerly 29c8908ef7]
Former-commit-id: 8ee3d9b304
2012-10-24 15:27:56 -05:00
Steve Harris
e2d16a2397 Merge branch 'ss_builds' (12.11.1-10) into development
Former-commit-id: 361fbe1bbc [formerly af3161539a] [formerly e8e3ef530c] [formerly 1b2cb0db6c [formerly e8e3ef530c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]]]
Former-commit-id: 1b2cb0db6c
Former-commit-id: c89c5de66f934499d010cfbf2b542bdd16edee2c [formerly 19dca3feca]
Former-commit-id: 28dccc0278
2012-10-24 15:15:14 -05:00
Steve Harris
e7a5f938d5 12.11.1-10 baseline
Former-commit-id: 7779b584c0 [formerly 63dddc5f5f] [formerly e845c605e6] [formerly 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]
Former-commit-id: 0ba69044a2
Former-commit-id: 6fcb4f94c3d3270f1daa5300ab582f30625bdf7c [formerly cc21977c35]
Former-commit-id: 61224dec54
2012-10-24 15:13:57 -05:00
Ron Anderson
183f7e5243 Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run
Change-Id: Ie9bfc66b5cba7639155944765701833ffa788660

Former-commit-id: 74d0bba75e [formerly bd5537e63d] [formerly e226e41852] [formerly e0b809db9f [formerly e226e41852 [formerly f00655f5c5fb53af0682313e5054124a459b9649]]]
Former-commit-id: e0b809db9f
Former-commit-id: 8f39dfabbd79832148c02f9c6f259f5d303637f4 [formerly 56a04517a8]
Former-commit-id: a0402bb612
2012-10-24 14:11:30 -05:00
Steve Harris
81db247276 Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 95727755c7 [formerly 3eff876edd] [formerly 6118445ed7c2dbe29fc3fbd891afff9ce39d62fb [formerly a7337d9160]] [formerly 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: a722324705ed3164c37a327413de2e52d14ffae3 [formerly 892e4df811]
Former-commit-id: 8486da2fd3
2012-10-18 16:01:05 -05:00
Steve Harris
ae73939b02 12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]
Former-commit-id: 8beb6fc0b8
2012-10-18 15:53:01 -05:00
Steve Harris
dfdf01de85 12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]
Former-commit-id: 85ad066b70
2012-10-18 15:46:42 -05:00
Ben Steffensmeier
17d8918df8 Issue #189 fix unified grid problems found during install/upgrade on testbed
Former-commit-id: e557ea73c3 [formerly f3331dc743] [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 830a8bd7c2 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]]
Former-commit-id: 90b815d412
Former-commit-id: 277a0c28dd34718cb8b2c32568f24ebe0b4531a4 [formerly ea2f15c0df]
Former-commit-id: db2c9b41ec
2012-10-18 13:27:37 -05:00
Steve Harris
d88afce365 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]
Former-commit-id: d0e91329b4
2012-10-16 15:48:14 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Steve Harris
1b5f2c2f54 Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: 6659a96ac6 [formerly 8b7665418a] [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 0a42cb87a4 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 317e3e14ff2323c9c71ba64860412db38413e9d9 [formerly 63da835aef]
Former-commit-id: f0121b6fa8
2012-10-16 09:20:37 -05:00
Steve Harris
7fcbb49a3e 12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031]
Former-commit-id: 725b2f8ba5
2012-10-15 16:30:31 -05:00
Nate Jensen
446d7f5f13 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]
Former-commit-id: 93143bbda0
2012-10-12 15:16:27 -05:00
Ben Steffensmeier
97c23508d7 Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]
Former-commit-id: fde1e73d58
2012-10-12 12:45:50 -05:00
Ron Anderson
d4eaa7a659 Issue #1091 Fixed combination file generation.
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: e3d598d337 [formerly c264f72a53] [formerly 4ca413a222] [formerly 510cabe655 [formerly 4ca413a222 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]]
Former-commit-id: 510cabe655
Former-commit-id: db13c0f5d9711fc778c639ebf3e3fedd6dee6c74 [formerly e0fc2a36c6]
Former-commit-id: 488d357413
2012-10-12 10:32:36 -05:00
Ron Anderson
11d1e246b4 Issue #1260 Changed D2DGridDatabase to do slab requests. Added GFEPerformance logging statements.
Change-Id: I84928d372e771a6cd33b1c37dc6161e6f2e3b511

Former-commit-id: 0c3cd58b5d [formerly 363e4e9aea] [formerly 7450fe4147] [formerly f186cb007e [formerly 7450fe4147 [formerly 2a65735c97eb4f2285cea5c01760f190a5ad26ab]]]
Former-commit-id: f186cb007e
Former-commit-id: 24a44f56c6de9cdb11253e6c07b932686b654211 [formerly e3414c4e7e]
Former-commit-id: cd4c7db6f1
2012-10-11 15:03:13 -05:00
Ron Anderson
a324afdfaf Issue #1239 Fixed 64-bit Cave crash
Change-Id: I83d729b1f463b2043b1186615751dde047e5e824

Former-commit-id: 1ccf7edb48 [formerly ebdfe3816e] [formerly ad1d532459] [formerly e0236dc5c9 [formerly ad1d532459 [formerly 6b835a2d9f92d8bc4fc76e883ba4fb84256e185b]]]
Former-commit-id: e0236dc5c9
Former-commit-id: c6983bc29c269641156f95e70a7838417413631f [formerly 71351d7247]
Former-commit-id: 453b7c9a04
2012-10-08 15:01:44 -05:00
Ben Steffensmeier
7a7e91670a Issue #189 switch FFMP source config to grid.
Former-commit-id: eaf4d78d8d [formerly 691753fef2] [formerly 4007fa442b] [formerly 0b2121d3af [formerly 4007fa442b [formerly 85dac537f47cea6cc8ee6b0e0092c80544b6a89a]]]
Former-commit-id: 0b2121d3af
Former-commit-id: b210decd92a601ef96a5fce87ee03171f8384a52 [formerly ad8d2a2892]
Former-commit-id: b6fd0f6826
2012-10-01 16:10:32 -05:00
Steven Harris
9c67bbab77 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Ron Anderson
c63f5b5a0c Issue #1091 Code cleanup and update of online help files.
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 1eebe679a0 [formerly f1fb73e815] [formerly 4373858ac6] [formerly 34382eb228 [formerly 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]]
Former-commit-id: 34382eb228
Former-commit-id: e5cdaf5d466bae7f7e1bccf0bf9aee3d7b754797 [formerly a609aab630]
Former-commit-id: 1612c8d2c8
2012-09-25 16:07:05 -05:00
Ben Steffensmeier
263cfe59f4 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 69283c27a8 [formerly 5f787b6a6b] [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]
Former-commit-id: 0132d35871
Former-commit-id: 6b333c59dfdca8b278d838cd1ed91e9d23e9ae87 [formerly 174d8ad029]
Former-commit-id: d1c3a0c1eb
2012-09-20 12:24:35 -05:00
Ron Anderson
5d6911f931 Issue #1091 Added localMaps.py capability
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: 28efe7e4d6 [formerly dbe4f8f9b8] [formerly 6e2130a790] [formerly 776214bf24 [formerly 6e2130a790 [formerly 21db6a603d237716744d7cac93482c9a51952403]]]
Former-commit-id: 776214bf24
Former-commit-id: ce627290c20dc07d9b98e24e92ec594b3262f299 [formerly e917b45f38]
Former-commit-id: f5463c2e83
2012-09-19 17:41:48 -05:00