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
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
Ben Steffensmeier
6af74b843c
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
...
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 9eecab65c0
[formerly 4fe2127bfb
] [formerly bd8eb7fc15
] [formerly 05849f634d
[formerly bd8eb7fc15
[formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f
]
Former-commit-id: 6b058ace34
2012-09-18 15:19:05 -05:00
Steve Harris
429841d1ad
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: 9ed9283b30
[formerly 15a625adb7
] [formerly dd6ac67e17
] [formerly 39f15fe032
[formerly dd6ac67e17
[formerly 4e988dde641d01295134080111e738f25a110e6d]]]
Former-commit-id: 39f15fe032
Former-commit-id: 571dfe92ae7c0a4943df37ffd570fbfe3d20339b [formerly 9de7b02008
]
Former-commit-id: 7abc080c21
2012-09-17 15:46:11 -05:00
Steve Harris
70566fbec1
12.10.1-5 baseline
...
Former-commit-id: d0cd58d6bc
[formerly 82feb4de50
] [formerly a96d35a1fa
] [formerly 4fd8893e55
[formerly a96d35a1fa
[formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: 3760dcf872cc3205410a8002df70f1952ec6e644 [formerly deed84c1a2
]
Former-commit-id: a903893a09
2012-09-17 15:42:31 -05:00
Steve Harris
9d1f595fe6
Merge branch 'ss_builds' (12.10.1-4) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: bedc9569ca
[formerly 04de1d5857
] [formerly 29e7427dc3
] [formerly 04d9735c8f
[formerly 29e7427dc3
[formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6
]
Former-commit-id: e23b030dfd
2012-09-13 13:26:13 -05:00
Steve Harris
424c32bd5d
12.10.1-4 baseline
...
Former-commit-id: 0d8d18d7e2
[formerly e38e81ab8c
] [formerly fd19ca5624
] [formerly 49c3861597
[formerly fd19ca5624
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576
]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
Richard Peter
f1d458e450
Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
...
Former-commit-id: 5baaa6593f
[formerly c8443cf85c
] [formerly 701960a246
] [formerly 60b21393fc
[formerly 701960a246
[formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]
Former-commit-id: 60b21393fc
Former-commit-id: 1caef7b52e6ad68e0ead7729ecc24930c9ffc1dc [formerly b5d3a41fb1
]
Former-commit-id: 9d1413ff28
2012-09-12 08:27:11 -05:00
Steve Harris
64699fa90b
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9
[formerly de1639aea2
] [formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 21f430062b
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd
]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
David Gillingham
75daa050de
Issue #1150 : Fix regression caused by previous text product generation changes by ensuring all
...
directories get created.
Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0
Former-commit-id: fc39f37437
[formerly cff73c9e1d
] [formerly f192c8d115
] [formerly 83681d1ff6
[formerly f192c8d115
[formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]]
Former-commit-id: 83681d1ff6
Former-commit-id: 92c5f6a8e1768a660e1ac985fa2926880692a6db [formerly 9d13d3244d
]
Former-commit-id: 64bf7f0613
2012-09-07 12:29:36 -05:00
Bryan Kowal
0b7709663c
Issue #1134 - edex will now use the same jep library that CAVE does
...
Former-commit-id: f3a273027c
[formerly 3c63f21cfc
] [formerly ec89c440fe
] [formerly 04b574f56e
[formerly ec89c440fe
[formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]]
Former-commit-id: 04b574f56e
Former-commit-id: 64429dfda116bd48a4b498f09ed3888f7a1ee784 [formerly 84f7083b81
]
Former-commit-id: 8a04029498
2012-09-07 10:28:51 -05:00
Steve Harris
fd6e8d5b63
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da
[formerly 51eb89eb2a
] [formerly 91e39617cb
] [formerly a71dac6cad
[formerly 91e39617cb
[formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee
]
Former-commit-id: dbcb28ce77
2012-08-27 09:53:55 -05:00
Steve Harris
fffd905412
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: e1cf4b0b9a
[formerly 7a4f4ac493
] [formerly b8ab6066f6
] [formerly b77a4d40d7
[formerly b8ab6066f6
[formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb
]
Former-commit-id: 34fa4b5804
2012-08-22 16:00:33 -05:00
Steve Harris
a6797a478a
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: 57c1be9f5a
[formerly 084ac9fbd4
] [formerly d38f8b80f0
] [formerly 44a7cb75e7
[formerly d38f8b80f0
[formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6
]
Former-commit-id: b335416e06
2012-08-21 16:17:58 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb
]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Ron Anderson
21b48541c3
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 0a6de388dd
[formerly 16231374f8
] [formerly d7a818fd1d
] [formerly 7662d249ab
[formerly d7a818fd1d
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1
]
Former-commit-id: 6e3674f9fc
2012-08-17 12:41:49 -05:00
Ron Anderson
0a32c7c683
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: c71ee18e6e
[formerly 93c632c1ff
] [formerly 1321db6a99
] [formerly 819b9c8e56
[formerly 1321db6a99
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705
]
Former-commit-id: e5952c1c99
2012-08-17 12:20:08 -05:00
root
791f3f5b85
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd
[formerly 0987fc6b3d
] [formerly cb46f57879
] [formerly 5a453ee984
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209
]
Former-commit-id: 537dbadf64
2012-08-15 22:15:20 +00:00
Steve Harris
80655bf0a3
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b
]
Former-commit-id: d7d60cc623
2012-08-15 15:19:10 -05:00