Brad Gonzales
673749c4b9
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: d26119c383
[formerly b2656df2f8
] [formerly d26119c383
[formerly b2656df2f8
] [formerly 24fc32ee14
[formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: 781265a6a8
[formerly 5949c8b09c
]
Former-commit-id: e1a106fdbb
2012-10-26 14:00:55 -05:00
Nate Jensen
d67b0e704e
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: 409da6ad67
[formerly c70d361f2d
] [formerly 409da6ad67
[formerly c70d361f2d
] [formerly 73bc74d3d5
[formerly e032f584ec1caa3c9c973d554123678f828791a7]]]
Former-commit-id: 73bc74d3d5
Former-commit-id: 8ee3d9b304
[formerly 29c8908ef7
]
Former-commit-id: ebfe935ed0
2012-10-24 15:27:56 -05:00
Steve Harris
9b0cf384e7
Merge branch 'ss_builds' (12.11.1-10) into development
...
Former-commit-id: af3161539a
[formerly e8e3ef530c
] [formerly af3161539a
[formerly e8e3ef530c
] [formerly 1b2cb0db6c
[formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]]]
Former-commit-id: 1b2cb0db6c
Former-commit-id: 28dccc0278
[formerly 19dca3feca
]
Former-commit-id: 73004dd45a
2012-10-24 15:15:14 -05:00
Steve Harris
03c572edba
12.11.1-10 baseline
...
Former-commit-id: 63dddc5f5f
[formerly e845c605e6
] [formerly 63dddc5f5f
[formerly e845c605e6
] [formerly 0ba69044a2
[formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]
Former-commit-id: 0ba69044a2
Former-commit-id: 61224dec54
[formerly cc21977c35
]
Former-commit-id: 19c4526e61
2012-10-24 15:13:57 -05:00
Ron Anderson
119dd2f93e
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: bd5537e63d
[formerly e226e41852
] [formerly bd5537e63d
[formerly e226e41852
] [formerly e0b809db9f
[formerly f00655f5c5fb53af0682313e5054124a459b9649]]]
Former-commit-id: e0b809db9f
Former-commit-id: a0402bb612
[formerly 56a04517a8
]
Former-commit-id: d7de405506
2012-10-24 14:11:30 -05:00
Steve Harris
35c2a8e26f
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: 3eff876edd
[formerly a7337d9160
] [formerly 3eff876edd
[formerly a7337d9160
] [formerly 1807100932
[formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3
[formerly 892e4df811
]
Former-commit-id: 8a17564ba3
2012-10-18 16:01:05 -05:00
Steve Harris
9c597c7060
12.11.1-6 baseline
...
Former-commit-id: 30c786a885
[formerly fba4a443a0
] [formerly 30c786a885
[formerly fba4a443a0
] [formerly 5c1f3cdc46
[formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8
[formerly 08fc9f6b14
]
Former-commit-id: 4f27cbb406
2012-10-18 15:53:01 -05:00
Steve Harris
13cdd55545
12.11.1-5 baseline
...
Former-commit-id: 362d6ffaca
[formerly 03f3f3c36a
] [formerly 362d6ffaca
[formerly 03f3f3c36a
] [formerly a0eaf651ff
[formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70
[formerly e31c1e5bba
]
Former-commit-id: dff8d5de9c
2012-10-18 15:46:42 -05:00
Steve Harris
1e4c737ff2
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: da7a11fe97
[formerly 4610ecc513
] [formerly da7a11fe97
[formerly 4610ecc513
] [formerly 751563e331
[formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: d0e91329b4
[formerly 0c0c1144c6
]
Former-commit-id: ad78266035
2012-10-16 15:48:14 -05:00
Steve Harris
35e34308c5
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9
[formerly d3497e47eb
] [formerly 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07
[formerly cbbdb231ce
]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00
Steve Harris
0ad4e4f39a
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: 8b7665418a
[formerly 0a42cb87a4
] [formerly 8b7665418a
[formerly 0a42cb87a4
] [formerly 63ffdac2b7
[formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: f0121b6fa8
[formerly 63da835aef
]
Former-commit-id: 99147526f9
2012-10-16 09:20:37 -05:00
Steve Harris
c25ebcdc41
12.11.1-3 baseline
...
Former-commit-id: 196afa0e5f
[formerly 2d0c424713
] [formerly 196afa0e5f
[formerly 2d0c424713
] [formerly 5d796f775c
[formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 725b2f8ba5
[formerly 5723fb0031
]
Former-commit-id: bf1f88482b
2012-10-15 16:30:31 -05:00
Nate Jensen
1efcd36987
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
...
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: cbc2da0c06
[formerly f2cbf0c5c3
] [formerly cbc2da0c06
[formerly f2cbf0c5c3
] [formerly 8e4a7ec406
[formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 93143bbda0
[formerly 5bdf9d4d38
]
Former-commit-id: 319c4cda2b
2012-10-12 15:16:27 -05:00
Ron Anderson
9a588ce114
Issue #1091 Fixed combination file generation.
...
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2
Former-commit-id: c264f72a53
[formerly 4ca413a222
] [formerly c264f72a53
[formerly 4ca413a222
] [formerly 510cabe655
[formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]]
Former-commit-id: 510cabe655
Former-commit-id: 488d357413
[formerly e0fc2a36c6
]
Former-commit-id: 47da164ca6
2012-10-12 10:32:36 -05:00
Ron Anderson
22a2d53091
Issue #1260 Changed D2DGridDatabase to do slab requests. Added GFEPerformance logging statements.
...
Change-Id: I84928d372e771a6cd33b1c37dc6161e6f2e3b511
Former-commit-id: 363e4e9aea
[formerly 7450fe4147
] [formerly 363e4e9aea
[formerly 7450fe4147
] [formerly f186cb007e
[formerly 2a65735c97eb4f2285cea5c01760f190a5ad26ab]]]
Former-commit-id: f186cb007e
Former-commit-id: cd4c7db6f1
[formerly e3414c4e7e
]
Former-commit-id: 667a2f0efe
2012-10-11 15:03:13 -05:00
Ron Anderson
424872d1b0
Issue #1239 Fixed 64-bit Cave crash
...
Change-Id: I83d729b1f463b2043b1186615751dde047e5e824
Former-commit-id: ebdfe3816e
[formerly ad1d532459
] [formerly ebdfe3816e
[formerly ad1d532459
] [formerly e0236dc5c9
[formerly 6b835a2d9f92d8bc4fc76e883ba4fb84256e185b]]]
Former-commit-id: e0236dc5c9
Former-commit-id: 453b7c9a04
[formerly 71351d7247
]
Former-commit-id: 014d67c707
2012-10-08 15:01:44 -05:00
Steven Harris
2f855322f6
12.11.1-1 baseline
...
Former-commit-id: 0e86bfd1d3
[formerly 618aa3f316
] [formerly 0e86bfd1d3
[formerly 618aa3f316
] [formerly feec28f274
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93
[formerly 8843ffd022
]
Former-commit-id: a544be6d83
2012-09-27 15:57:45 -05:00
Ron Anderson
763b5aa86b
Issue #1091 Code cleanup and update of online help files.
...
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2
Former-commit-id: f1fb73e815
[formerly 4373858ac6
] [formerly f1fb73e815
[formerly 4373858ac6
] [formerly 34382eb228
[formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]]
Former-commit-id: 34382eb228
Former-commit-id: 1612c8d2c8
[formerly a609aab630
]
Former-commit-id: 6f00c3b872
2012-09-25 16:07:05 -05:00
Ron Anderson
43f30abdf3
Issue #1091 Added localMaps.py capability
...
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f
Former-commit-id: dbe4f8f9b8
[formerly 6e2130a790
] [formerly dbe4f8f9b8
[formerly 6e2130a790
] [formerly 776214bf24
[formerly 21db6a603d237716744d7cac93482c9a51952403]]]
Former-commit-id: 776214bf24
Former-commit-id: f5463c2e83
[formerly e917b45f38
]
Former-commit-id: af7cac638e
2012-09-19 17:41:48 -05:00
Steve Harris
9966493ff3
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: 15a625adb7
[formerly dd6ac67e17
] [formerly 15a625adb7
[formerly dd6ac67e17
] [formerly 39f15fe032
[formerly 4e988dde641d01295134080111e738f25a110e6d]]]
Former-commit-id: 39f15fe032
Former-commit-id: 7abc080c21
[formerly 9de7b02008
]
Former-commit-id: beb08c98ce
2012-09-17 15:46:11 -05:00
Steve Harris
288d4afff5
12.10.1-5 baseline
...
Former-commit-id: 82feb4de50
[formerly a96d35a1fa
] [formerly 82feb4de50
[formerly a96d35a1fa
] [formerly 4fd8893e55
[formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: a903893a09
[formerly deed84c1a2
]
Former-commit-id: 430a11f72b
2012-09-17 15:42:31 -05:00
Steve Harris
30b0700044
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: 04de1d5857
[formerly 29e7427dc3
] [formerly 04de1d5857
[formerly 29e7427dc3
] [formerly 04d9735c8f
[formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: e23b030dfd
[formerly 53673f63e6
]
Former-commit-id: f80fb62837
2012-09-13 13:26:13 -05:00
Steve Harris
e57e7237a9
12.10.1-4 baseline
...
Former-commit-id: e38e81ab8c
[formerly fd19ca5624
] [formerly e38e81ab8c
[formerly fd19ca5624
] [formerly 49c3861597
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5
[formerly 2ba58a3576
]
Former-commit-id: 26b7d083ec
2012-09-13 12:08:11 -05:00
Richard Peter
457cb5375e
Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
...
Former-commit-id: c8443cf85c
[formerly 701960a246
] [formerly c8443cf85c
[formerly 701960a246
] [formerly 60b21393fc
[formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]
Former-commit-id: 60b21393fc
Former-commit-id: 9d1413ff28
[formerly b5d3a41fb1
]
Former-commit-id: c142137798
2012-09-12 08:27:11 -05:00
Steve Harris
5030894212
12.10.1-3 baseline
...
Former-commit-id: de1639aea2
[formerly 21f430062b
] [formerly de1639aea2
[formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db
[formerly 438d139fdd
]
Former-commit-id: faadb51529
2012-09-11 16:00:38 -05:00
David Gillingham
0497ffc0d8
Issue #1150 : Fix regression caused by previous text product generation changes by ensuring all
...
directories get created.
Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0
Former-commit-id: cff73c9e1d
[formerly f192c8d115
] [formerly cff73c9e1d
[formerly f192c8d115
] [formerly 83681d1ff6
[formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]]
Former-commit-id: 83681d1ff6
Former-commit-id: 64bf7f0613
[formerly 9d13d3244d
]
Former-commit-id: 7bb5d95ac5
2012-09-07 12:29:36 -05:00
Bryan Kowal
c497827083
Issue #1134 - edex will now use the same jep library that CAVE does
...
Former-commit-id: 3c63f21cfc
[formerly ec89c440fe
] [formerly 3c63f21cfc
[formerly ec89c440fe
] [formerly 04b574f56e
[formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]]
Former-commit-id: 04b574f56e
Former-commit-id: 8a04029498
[formerly 84f7083b81
]
Former-commit-id: 6f159f35de
2012-09-07 10:28:51 -05:00
Steve Harris
3f44e46a6f
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: 51eb89eb2a
[formerly 91e39617cb
] [formerly 51eb89eb2a
[formerly 91e39617cb
] [formerly a71dac6cad
[formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77
[formerly 87a602dfee
]
Former-commit-id: 0b647c0c9d
2012-08-27 09:53:55 -05:00
Steve Harris
d404638d82
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: 7a4f4ac493
[formerly b8ab6066f6
] [formerly 7a4f4ac493
[formerly b8ab6066f6
] [formerly b77a4d40d7
[formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 34fa4b5804
[formerly b2c0dd1abb
]
Former-commit-id: 8f1120f6d8
2012-08-22 16:00:33 -05:00
Steve Harris
85533bdd24
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: 084ac9fbd4
[formerly d38f8b80f0
] [formerly 084ac9fbd4
[formerly d38f8b80f0
] [formerly 44a7cb75e7
[formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: b335416e06
[formerly 77369f78a6
]
Former-commit-id: 445d1a6a0d
2012-08-21 16:17:58 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Ron Anderson
f69d7b9c64
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: 16231374f8
[formerly d7a818fd1d
] [formerly 16231374f8
[formerly d7a818fd1d
] [formerly 7662d249ab
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: 6e3674f9fc
[formerly d3693827a1
]
Former-commit-id: 1b655b0826
2012-08-17 12:41:49 -05:00
Ron Anderson
b78c280ac8
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 93c632c1ff
[formerly 1321db6a99
] [formerly 93c632c1ff
[formerly 1321db6a99
] [formerly 819b9c8e56
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: e5952c1c99
[formerly 6eafdda705
]
Former-commit-id: f7b9190b51
2012-08-17 12:20:08 -05:00
root
0eb9520e15
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 0987fc6b3d
[formerly cb46f57879
] [formerly 0987fc6b3d
[formerly cb46f57879
] [formerly 5a453ee984
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64
[formerly 8a66b2f209
]
Former-commit-id: 1792158ef8
2012-08-15 22:15:20 +00:00
Steve Harris
7e1d1f6e08
12.9.1-4 baseline
...
Former-commit-id: 36c108e960
[formerly dcda3a2290
] [formerly 36c108e960
[formerly dcda3a2290
] [formerly 33b95fb96d
[formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623
[formerly 9990bf909b
]
Former-commit-id: de9b64b501
2012-08-15 15:19:10 -05:00
Steve Harris
16d7d955fc
12.9.1-1 baseline
...
Former-commit-id: 8309193ce9
[formerly 31ae7ea218
] [formerly 8309193ce9
[formerly 31ae7ea218
] [formerly 79ce6cfd97
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df
[formerly 0c5d9e2416
]
Former-commit-id: 63bcadf121
2012-08-15 13:59:00 -05:00
Steve Harris
b62ac9c78e
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 54c505dd8e
[formerly 24799cd93d
] [formerly 54c505dd8e
[formerly 24799cd93d
] [formerly a1071e3204
[formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: dbe07ca70c
[formerly 8f4ddad22c
]
Former-commit-id: d507458b9b
2012-08-06 08:23:04 -05:00
Bryan Kowal
25ff80983e
Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
...
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36
Former-commit-id: dd1acbe70a
[formerly c6b2d65308
] [formerly dd1acbe70a
[formerly c6b2d65308
] [formerly 5ca4a66fdc
[formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: 14c20083b0
[formerly f295ee11ea
]
Former-commit-id: f064d0cf6c
2012-08-02 10:33:55 -05:00
Steve Harris
078b4fff3c
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: fb47934159
[formerly 6d77b94217
] [formerly fb47934159
[formerly 6d77b94217
] [formerly 51e38ca887
[formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f
[formerly 3476fe755b
]
Former-commit-id: e892eb4628
2012-08-01 12:43:12 -05:00
Steve Harris
d3be09bd74
12.8.1-5 baseline
...
Former-commit-id: 2653ddc2e3
[formerly fd2abfb6f1
] [formerly 2653ddc2e3
[formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6
[formerly e0c3722fd1
]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
James Korman
c901590446
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 1166a7cbb1
[formerly 38a2e426d9
] [formerly 1166a7cbb1
[formerly 38a2e426d9
] [formerly 4cbbc59278
[formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 16643cb1bc
[formerly 5df52e38f9
]
Former-commit-id: 41a80adfb1
2012-07-31 13:38:23 -05:00
Bryan Kowal
93967d22c2
Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
...
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6
Former-commit-id: 67035fa0b8
[formerly 327ffa9439
] [formerly 67035fa0b8
[formerly 327ffa9439
] [formerly cd40d9accf
[formerly dca54e56436ace397c6163b03ac4edb480336404]]]
Former-commit-id: cd40d9accf
Former-commit-id: 6ac43a3c0c
[formerly 107831f23d
]
Former-commit-id: e0c0b5928f
2012-07-28 08:52:36 -05:00
Richard Peter
82db8b29eb
Merge "Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development
...
Former-commit-id: 1de59b48cf
[formerly 9e3cd2546a
] [formerly 1de59b48cf
[formerly 9e3cd2546a
] [formerly 77c2ab2c05
[formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]]]
Former-commit-id: 77c2ab2c05
Former-commit-id: b6a1b5011f
[formerly d131cd42cf
]
Former-commit-id: c8ce12f7ac
2012-07-27 14:50:00 -05:00
Steve Harris
84d0f1fbb6
Merge branch 'master' (OB12.7.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 07c40a9c0c
[formerly 56249c2611
] [formerly 07c40a9c0c
[formerly 56249c2611
] [formerly 587bb6a274
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326
[formerly 2aa4114e4d
]
Former-commit-id: d7540c958f
2012-07-27 14:44:44 -05:00
Max Schenkelberg
9a1cd3b5e1
Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R
...
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM. Also changed MessageGenerator to use new class for finding the wmo header
Amend: Added try-finally for input stream in DataUnzipper
Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1
Former-commit-id: 7ace2035c5
[formerly 756988cb8b
] [formerly 7ace2035c5
[formerly 756988cb8b
] [formerly b669f57ee4
[formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]]]
Former-commit-id: b669f57ee4
Former-commit-id: 864d6335a6
[formerly 51f9666fcb
]
Former-commit-id: e45c7f58ac
2012-07-27 14:42:36 -05:00
Steve Harris
36e2ad3023
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd
[formerly 16bf591a33
] [formerly 11f96dbedd
[formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24
[formerly 9f97182964
]
Former-commit-id: 9aabe438b9
2012-07-19 16:20:40 -05:00
Bryan Kowal
fee2a4e419
Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
...
Former-commit-id: b446253674
[formerly db6b535eb6
] [formerly b446253674
[formerly db6b535eb6
] [formerly 1e5b71ee7b
[formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 34a4f58074
[formerly 46198b0c92
]
Former-commit-id: de1d59a174
2012-07-12 12:58:40 -05:00
Bryan Kowal
095a4ebfa2
Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
...
Former-commit-id: 7f6015eba5
[formerly 0f31fadffa
] [formerly 7f6015eba5
[formerly 0f31fadffa
] [formerly bde6be6e2b
[formerly ea1b0920d908481e28477329497204dda324bd3e]]]
Former-commit-id: bde6be6e2b
Former-commit-id: 6d961d22fb
[formerly 00c9a0f708
]
Former-commit-id: 5b87488b52
2012-07-11 17:31:55 -05:00
Bryan Kowal
50d469075a
Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
...
Former-commit-id: 6fe6e64f38
[formerly 5058c32c34
] [formerly 6fe6e64f38
[formerly 5058c32c34
] [formerly 31f2db8719
[formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]]
Former-commit-id: 31f2db8719
Former-commit-id: 43f3d40a8e
[formerly 5619099acd
]
Former-commit-id: 8378fadbc2
2012-07-11 16:28:28 -05:00
Bryan Kowal
e4a1ecfc18
Merge branch 'merge_development' into development
...
Former-commit-id: 226818bda5
[formerly 051a51b79c
] [formerly 226818bda5
[formerly 051a51b79c
] [formerly b27994c9b1
[formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]]
Former-commit-id: b27994c9b1
Former-commit-id: 541b59d060
[formerly fa5eb7a16a
]
Former-commit-id: a922be1a5d
2012-07-10 17:03:21 -05:00