Steve Harris
ab8b1ae64d
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
...
Former-commit-id: 794a9a083b8340d322c915139968ba5a4fe2ee54
2012-12-11 08:56:54 -06:00
Steve Harris
43ddfe98c4
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: e733dd9d05d3704f86e2a711607a1834df1a56f2
2012-12-11 08:45:53 -06:00
Brad Gonzales
bcff2c134c
Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
...
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d
Former-commit-id: 5aa303242b0ca1abf08685b6197ddd17d465250c
2012-12-10 14:08:54 -06:00
Dave Hladky
e34b9a8862
Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
...
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d
Former-commit-id: 039fdaacc80f5158240de028541ba6688fa1d468
2012-12-06 16:06:14 -06:00
Dustin Johnson
bba092f51e
Issue #1377 Break registry dependency on data delivery
...
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea
Former-commit-id: f560beb5c66541859abd36cab855a7b6a8c8ded9
2012-12-03 12:06:32 -06:00
Ben Steffensmeier
5eb58b7ef3
Issue #1358 add database-common to ingestDat
...
Former-commit-id: c23d773e8d03db2c6a4735ea4e91e933b253a058
2012-11-27 16:58:18 -06:00
Richard Peter
53426e2e90
Merge "Issue #1350 : Track ingestGrib and ingestDat statistics" into development
...
Former-commit-id: 08b5d690e71afd7424fc00e0d4c06b497447d93a
2012-11-26 18:15:21 -06:00
Richard Peter
8d40a8fea9
Issue #1350 : Track ingestGrib and ingestDat statistics
...
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132
Former-commit-id: 3bbb6602d8ee99792b4a65e040091d1a1923d0b1
2012-11-26 18:13:13 -06:00
Bryan Kowal
06241d95e0
Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature
...
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0
Former-commit-id: 31df15583f3b0182736728654b6131fd7d6bc9a8
2012-11-26 13:06:33 -06:00
Dustin Johnson
13b1683458
Issue #1322 Move router registry to edex.xml
...
Amend:
Add requestRouterRegistry to viz Spring file.
Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864
Former-commit-id: dc3f0b465628d312f675b16d61c0456bf79edc7d
2012-11-19 13:21:03 -06:00
Dustin Johnson
ea7e8ac946
Issue #1322 Fix ingestGrib modes.xml to include router spring file
...
Amend:
Add correct bean name.
Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349
Former-commit-id: a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0
2012-11-19 12:03:31 -06:00
Dustin Johnson
87148a8061
Issue #1322 Add server keyed routing
...
Amend:
Remove ServiceLoader files for RequestRouter.
Resolve peer review comments.
Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b
Former-commit-id: d7010894ecd0d1702567d52260fdf6088468eb09
2012-11-16 14:43:45 -06:00
Ben Steffensmeier
1a7560b8a3
Issue #189 fix modes for gridcoverage to include converter registration
...
Former-commit-id: 0c521bea12f61d70ee144149a83cd9f8a492b891
2012-11-16 12:25:00 -06:00
Benjamin Phillippe
5bf46d468d
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0
2012-11-15 13:35:25 -06:00
Dustin Johnson
bff32bbe58
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: 2f676ffcab1c9efa612a52283d05e56f9c748569
2012-11-14 14:41:57 -06:00
Steve Harris
85130eb611
12.12.1-4 baseline
...
Former-commit-id: 4a7e3fabdef8d948216483965c1f62e5216bf362
2012-11-14 14:19:20 -06:00
Dustin Johnson
7d9e7567bd
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 07aeec469a83ce07286bc27ea3e6bda41909be8d
2012-11-14 12:19:10 -06:00
Brad Gonzales
4af27e092f
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295
2012-11-14 09:39:26 -06:00
Steve Harris
448dd1c35f
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 7a44f29952ec89991e578c67357e1ef3f3c51d59
2012-11-13 17:28:50 -06:00
Steve Harris
c999505fba
12.12.1-3 baseline
...
Former-commit-id: 8481c91f9918a61631198331c324c4c5a76aac0f
2012-11-13 17:27:04 -06:00
Ben Steffensmeier
69fc030bb4
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: 911c845199714c07e93f9847ab00fcd6d28a4223
2012-11-13 16:00:19 -06:00
Ben Steffensmeier
535c73051d
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 8db340a796df354059f3d4142db92dfd5fa527f5
2012-11-08 14:45:36 -06:00
Nate Jensen
b32a9e839e
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: 1902ab64c3ab11c41af906e5d78368689833561f
2012-11-07 18:18:06 -06:00
Steve Harris
e4bd20a515
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Max Schenkelberg
2f90120248
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: a9c7374d162296c170f7c1b80e1fb2978b854cfd
2012-11-07 10:44:42 -06:00
Bryan Kowal
9263a0ac57
Issue #1276 - v1.0 of multiple WA deployment support
...
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5
Former-commit-id: 2d35b221dca2248da68ae1d11f20b40dfb11052c
2012-11-06 16:13:26 -06:00
Dustin Johnson
2f28e19bf6
Issue #1302 Fixes for data delivery merge with development branch.
...
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: 87641d4b41b10f66e12c8d839548b8012e900438
2012-11-01 16:31:14 -05:00
Dustin Johnson
98d7beae50
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: 89583d97c8823818f87dc1a234078d85ba7bea4a
2012-11-01 13:36:06 -05:00
Brad Gonzales
9137f334b5
Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
...
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41
Former-commit-id: 540bbd59715aaf7479b5a824a021ce79bb387335
2012-11-01 11:02:48 -05:00
Brad Gonzales
68a3a98547
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: 96bb97c32f664e015a29ac5c3187e6b27160a872
2012-10-31 21:20:40 -05:00
Ben Steffensmeier
d0a2ed32b5
merge branch Unifeid_Grid into developement
...
Former-commit-id: 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7
2012-10-30 12:24:54 -05:00
Brad Gonzales
b2656df2f8
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: 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55
2012-10-26 14:00:55 -05:00
Ben Steffensmeier
b7d61e7543
Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
...
Former-commit-id: 8bcb077174ef7bcb923dd974e53e82f12936b580
2012-10-25 16:17:54 -05:00
Ben Steffensmeier
6a9ff88b33
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: ab80625b5c573d8ab1350b4c251414ea036ef016
2012-10-25 12:22:11 -05:00
Nate Jensen
c70d361f2d
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: e032f584ec1caa3c9c973d554123678f828791a7
2012-10-24 15:27:56 -05:00
Steve Harris
e8e3ef530c
Merge branch 'ss_builds' (12.11.1-10) into development
...
Former-commit-id: 5a8bdbc21d671bf456be4d22da7c8773042e3f09
2012-10-24 15:15:14 -05:00
Steve Harris
e845c605e6
12.11.1-10 baseline
...
Former-commit-id: 9dd41e6322bad3e7dced1a32867d9a7f886d70cf
2012-10-24 15:13:57 -05:00
Ron Anderson
e226e41852
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: f00655f5c5fb53af0682313e5054124a459b9649
2012-10-24 14:11:30 -05:00
Steve Harris
a7337d9160
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: de600d1a0e309ddbb4838526a9f92af05282cd1a
2012-10-18 16:01:05 -05:00
Steve Harris
fba4a443a0
12.11.1-6 baseline
...
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
2012-10-18 15:53:01 -05:00
Steve Harris
03f3f3c36a
12.11.1-5 baseline
...
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
2012-10-18 15:46:42 -05:00
Ben Steffensmeier
830a8bd7c2
Issue #189 fix unified grid problems found during install/upgrade on testbed
...
Former-commit-id: 4c444ce1a007f844010eb43846070d97d6c811bf
2012-10-18 13:27:37 -05:00
Steve Harris
4610ecc513
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: 07beab271f793ae79fcf9233f9d384702ead22a9
2012-10-16 15:48:14 -05:00
Steve Harris
d3497e47eb
12.11.1-4 baseline
...
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Steve Harris
0a42cb87a4
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: 5ebfa0e773d325c57ac8097b46537817d5d47842
2012-10-16 09:20:37 -05:00
Steve Harris
2d0c424713
12.11.1-3 baseline
...
Former-commit-id: 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86
2012-10-15 16:30:31 -05:00
Nate Jensen
f2cbf0c5c3
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
...
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1
2012-10-12 15:16:27 -05:00
Ben Steffensmeier
8b7256b1ae
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: f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90
2012-10-12 12:45:50 -05:00
Ron Anderson
4ca413a222
Issue #1091 Fixed combination file generation.
...
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2
Former-commit-id: 0c4bf9ce1271334d2a07205a42efc60cf7c397f0
2012-10-12 10:32:36 -05:00
Ron Anderson
7450fe4147
Issue #1260 Changed D2DGridDatabase to do slab requests. Added GFEPerformance logging statements.
...
Change-Id: I84928d372e771a6cd33b1c37dc6161e6f2e3b511
Former-commit-id: 2a65735c97eb4f2285cea5c01760f190a5ad26ab
2012-10-11 15:03:13 -05:00
