Commit graph

111 commits

Author SHA1 Message Date
Steve Harris
113fdcb679 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]
Former-commit-id: ce72ebb094
2012-12-11 08:56:54 -06:00
Steve Harris
6287b32e7d Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: f6988eefff
2012-12-11 08:45:53 -06:00
Brad Gonzales
065ddf4d4a Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d

Former-commit-id: bcff2c134c [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]
Former-commit-id: 6ab74bb6ab
2012-12-10 14:08:54 -06:00
Dave Hladky
b5689bac66 Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d

Former-commit-id: e34b9a8862 [formerly 039fdaacc80f5158240de028541ba6688fa1d468]
Former-commit-id: 92e8877af4
2012-12-06 16:06:14 -06:00
Dustin Johnson
1b165c8e73 Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: bba092f51e [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]
Former-commit-id: 529238d010
2012-12-03 12:06:32 -06:00
Ben Steffensmeier
2fa293fc9d Issue #1358 add database-common to ingestDat
Former-commit-id: 5eb58b7ef3 [formerly c23d773e8d03db2c6a4735ea4e91e933b253a058]
Former-commit-id: 9b0ca8043e
2012-11-27 16:58:18 -06:00
Richard Peter
b891bb63e1 Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 8d40a8fea9 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]
Former-commit-id: 4d5f2fd360
2012-11-26 18:13:13 -06:00
Dustin Johnson
1bb69653af Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

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

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: ea7e8ac946 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]
Former-commit-id: 63db1ce6f8
2012-11-19 12:03:31 -06:00
Dustin Johnson
1d5714b994 Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]
Former-commit-id: 8a6be78eb0
2012-11-16 14:43:45 -06:00
Ben Steffensmeier
2a0769d094 Issue #189 fix modes for gridcoverage to include converter registration
Former-commit-id: 1a7560b8a3 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]
Former-commit-id: 6b0ed3fa50
2012-11-16 12:25:00 -06:00
Benjamin Phillippe
6b1b73429b Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 5bf46d468d [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]
Former-commit-id: 5c31b34e12
2012-11-15 13:35:25 -06:00
Dustin Johnson
e25b7c312b 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: bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]
Former-commit-id: 0d1d663f41
2012-11-14 14:41:57 -06:00
Steve Harris
628ca9e5c6 12.12.1-4 baseline
Former-commit-id: 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 57578da521
2012-11-14 14:19:20 -06:00
Dustin Johnson
c0c60c2488 Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

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

Former-commit-id: 4af27e092f [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]
Former-commit-id: 1617341e2a
2012-11-14 09:39:26 -06:00
Steve Harris
c8cac52915 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]
Former-commit-id: 00f3d51546
2012-11-13 17:28:50 -06:00
Steve Harris
2797cbcdd0 12.12.1-3 baseline
Former-commit-id: c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: b3b5e6d28f
2012-11-13 17:27:04 -06:00
Ben Steffensmeier
60f78c22e3 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: 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]
Former-commit-id: e8090e654b
2012-11-13 16:00:19 -06:00
Ben Steffensmeier
884c82c4fe Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

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

Former-commit-id: 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]
Former-commit-id: 693090cb36
2012-11-08 14:45:36 -06:00
Steve Harris
214fcd3b63 12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e1498006c7
2012-11-07 12:41:20 -06:00
Max Schenkelberg
747ab974e9 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: 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]
Former-commit-id: ca4177dd08
2012-11-07 10:44:42 -06:00
Dustin Johnson
bcf575966b 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: 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 31d7d09c10
2012-11-01 13:36:06 -05:00
Brad Gonzales
253c19ae05 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: 68a3a98547 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]
Former-commit-id: 44e9238fa9
2012-10-31 21:20:40 -05:00
Ben Steffensmeier
92fd247ccc merge branch Unifeid_Grid into developement
Former-commit-id: d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]
Former-commit-id: b6a1563bb2
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
54f414a7e0 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]
Former-commit-id: 6f2c1ede9e
2012-10-25 16:17:54 -05:00
Ben Steffensmeier
a77d2097f8 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]
Former-commit-id: c2934ae7a5
2012-10-25 12:22:11 -05:00
Nate Jensen
29c8908ef7 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: c70d361f2d [formerly e032f584ec1caa3c9c973d554123678f828791a7]
Former-commit-id: 73bc74d3d5
2012-10-24 15:27:56 -05:00
Steve Harris
19dca3feca Merge branch 'ss_builds' (12.11.1-10) into development
Former-commit-id: e8e3ef530c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]
Former-commit-id: 1b2cb0db6c
2012-10-24 15:15:14 -05:00
Steve Harris
cc21977c35 12.11.1-10 baseline
Former-commit-id: e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]
Former-commit-id: 0ba69044a2
2012-10-24 15:13:57 -05:00
Ron Anderson
56a04517a8 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: e226e41852 [formerly f00655f5c5fb53af0682313e5054124a459b9649]
Former-commit-id: e0b809db9f
2012-10-24 14:11:30 -05:00
Steve Harris
892e4df811 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: a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]
Former-commit-id: 1807100932
2012-10-18 16:01:05 -05:00
Steve Harris
08fc9f6b14 12.11.1-6 baseline
Former-commit-id: fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]
Former-commit-id: 5c1f3cdc46
2012-10-18 15:53:01 -05:00
Steve Harris
e31c1e5bba 12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: a0eaf651ff
2012-10-18 15:46:42 -05:00
Ben Steffensmeier
ea2f15c0df Issue #189 fix unified grid problems found during install/upgrade on testbed
Former-commit-id: 830a8bd7c2 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]
Former-commit-id: 90b815d412
2012-10-18 13:27:37 -05:00
Steve Harris
cbbdb231ce 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
2012-10-16 13:27:07 -05:00
Steve Harris
63da835aef 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: 0a42cb87a4 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]
Former-commit-id: 63ffdac2b7
2012-10-16 09:20:37 -05:00
Steve Harris
5723fb0031 12.11.1-3 baseline
Former-commit-id: 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]
Former-commit-id: 5d796f775c
2012-10-15 16:30:31 -05:00
Nate Jensen
5bdf9d4d38 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]
Former-commit-id: 8e4a7ec406
2012-10-12 15:16:27 -05:00
Ben Steffensmeier
fed5a35af3 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: 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]
Former-commit-id: 266a2f317f
2012-10-12 12:45:50 -05:00
Ron Anderson
e0fc2a36c6 Issue #1091 Fixed combination file generation.
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

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

Former-commit-id: 7450fe4147 [formerly 2a65735c97eb4f2285cea5c01760f190a5ad26ab]
Former-commit-id: f186cb007e
2012-10-11 15:03:13 -05:00
Ron Anderson
71351d7247 Issue #1239 Fixed 64-bit Cave crash
Change-Id: I83d729b1f463b2043b1186615751dde047e5e824

Former-commit-id: ad1d532459 [formerly 6b835a2d9f92d8bc4fc76e883ba4fb84256e185b]
Former-commit-id: e0236dc5c9
2012-10-08 15:01:44 -05:00
Ben Steffensmeier
ad8d2a2892 Issue #189 switch FFMP source config to grid.
Former-commit-id: 4007fa442b [formerly 85dac537f47cea6cc8ee6b0e0092c80544b6a89a]
Former-commit-id: 0b2121d3af
2012-10-01 16:10:32 -05:00
Steven Harris
8843ffd022 12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: feec28f274
2012-09-27 15:57:45 -05:00
Ron Anderson
a609aab630 Issue #1091 Code cleanup and update of online help files.
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]
Former-commit-id: 34382eb228
2012-09-25 16:07:05 -05:00
Ben Steffensmeier
174d8ad029 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]
Former-commit-id: 0132d35871
2012-09-20 12:24:35 -05:00
Ron Anderson
e917b45f38 Issue #1091 Added localMaps.py capability
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: 6e2130a790 [formerly 21db6a603d237716744d7cac93482c9a51952403]
Former-commit-id: 776214bf24
2012-09-19 17:41:48 -05:00
Ben Steffensmeier
b547d9dd8f Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]
Former-commit-id: 05849f634d
2012-09-18 15:19:05 -05:00
Steve Harris
9de7b02008 Merge branch 'ss_builds' (12.10.1-5) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java

Former-commit-id: dd6ac67e17 [formerly 4e988dde641d01295134080111e738f25a110e6d]
Former-commit-id: 39f15fe032
2012-09-17 15:46:11 -05:00