Steve Harris
0a5772e795
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 69dc3d835b
[formerly 24ab7cff49
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 6cb92b1f57
[formerly b62efa9387
] [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a
]]
Former-commit-id: 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a [formerly 2a967fc9b5
]
Former-commit-id: 69626ab704
2014-01-21 12:36:54 -06:00
Ron Anderson
643c0819b1
Issue #2717 Force use of legacy merge sort
...
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7
Former-commit-id: a481848c67
[formerly 34d1b95a79
] [formerly de97ec032f
] [formerly a481848c67
[formerly 34d1b95a79
] [formerly de97ec032f
] [formerly 66bbc99784
[formerly de97ec032f
[formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]]
Former-commit-id: 66bbc99784
Former-commit-id: 9b8c8310ab
[formerly 0048ef6a96
] [formerly c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c
]]
Former-commit-id: 52bde166e586e19680a1aa9f75a55d0e29557a25 [formerly 841504f145
]
Former-commit-id: 385547a5e5
2014-01-20 17:22:26 -06:00
Steve Harris
f8496662a0
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac
[formerly 5fcccbff1b
] [formerly 454d557884
] [formerly 002b2492ac
[formerly 5fcccbff1b
] [formerly 454d557884
] [formerly 9371eeeee0
[formerly 454d557884
[formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3
[formerly 7ea285c48b
] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616
]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb
]
Former-commit-id: ccd2f6cdaa
2014-01-20 10:17:44 -06:00
Richard Peter
097d4ff977
Issue #2125 : Clean up hibernate warnings
...
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e
Former-commit-id: d7e7ca2e26
[formerly f30181d730
] [formerly e2d20753e1
] [formerly d7e7ca2e26
[formerly f30181d730
] [formerly e2d20753e1
] [formerly 0c058f461c
[formerly e2d20753e1
[formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]]]]
Former-commit-id: 0c058f461c
Former-commit-id: 73b61633e2
[formerly caa06ce1e1
] [formerly 3b734e85284d24a2773d8ffa7aec5062ace9f74d [formerly 7054a06acb
]]
Former-commit-id: eb7f09d5072fbd11016af7d672f640cda7d690d0 [formerly ed1bc96a63
]
Former-commit-id: 52e1cbf540
2014-01-17 14:12:34 -06:00
Brian Clements
62ce9cd76a
Issue #2608 quartz components use single scheduler
...
configured quartz components to use a single scheduler
added workaround to camel limitation which requires management name set on context
added quartz properties file copied from the quartz jar (can be used to set thread count)
Former-commit-id: 16b34af5a8
[formerly f1c3efdd0e
] [formerly 3959c9e023
] [formerly 16b34af5a8
[formerly f1c3efdd0e
] [formerly 3959c9e023
] [formerly 1a5991dcf5
[formerly 3959c9e023
[formerly 2b16524026b3c8834e5846f8cd800ae4e1a95e07]]]]
Former-commit-id: 1a5991dcf5
Former-commit-id: 32bd012ee7
[formerly 1708f1c350
] [formerly 8e0e1ea619f2364f9bacc1be3d52e01d6a4500f8 [formerly f0b260d1ce
]]
Former-commit-id: 8b613f48d83eb607e6cb702166549c20dd5d2a20 [formerly d62dd50b7b
]
Former-commit-id: b18c7dcee6
2014-01-14 08:43:21 -06:00
Ron Anderson
f33f5aec85
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.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/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f
[formerly 0bde38cef3
] [formerly ba7a25a88f
] [formerly 2e8cbade9f
[formerly 0bde38cef3
] [formerly ba7a25a88f
] [formerly 62c445d872
[formerly ba7a25a88f
[formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe
[formerly dca7f21f7b
] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e
]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f
]
Former-commit-id: 77c132f706
2014-01-13 17:45:20 -06:00
Brad Gonzales
d5d66b8731
Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
...
RecurringSubscription. Add environment configuration files to unit tests setup. Changed the
devRegistry debug port to the same port as registry.
Amend: Updates from peer review.
Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a
Former-commit-id: 2c0c6fbcc7
[formerly 8eeb3dc412
] [formerly 4537513df7
] [formerly 2c0c6fbcc7
[formerly 8eeb3dc412
] [formerly 4537513df7
] [formerly 343a2495e5
[formerly 4537513df7
[formerly 33a3dead503276926af71d7355f87242f5250e54]]]]
Former-commit-id: 343a2495e5
Former-commit-id: 6868d8d12d
[formerly f57529be9b
] [formerly 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630
]]
Former-commit-id: 2c41b1048f19e32de7cfb868829f77a4d1b22782 [formerly 8b362ee404
]
Former-commit-id: b8c7be1225
2014-01-10 16:37:09 -06:00
Brad Gonzales
8fd73a5cd9
Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
...
thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.
Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617
Former-commit-id: c05358aac5
[formerly 02910c2a8c
] [formerly 07a4420596
] [formerly c05358aac5
[formerly 02910c2a8c
] [formerly 07a4420596
] [formerly 12860c79f9
[formerly 07a4420596
[formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]]
Former-commit-id: 12860c79f9
Former-commit-id: ad3da98af6
[formerly 5c85734e02
] [formerly 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2
]]
Former-commit-id: d63be2574bfe21dc4708216b7f896c519c9d925a [formerly a1ee60d16d
]
Former-commit-id: 44cff7514d
2014-01-08 13:37:17 -06:00
Steve Harris
e44faa7943
14.1.1-15 baseline
...
Former-commit-id: c6cb11a5f4
[formerly f88ff2bde9
] [formerly 8bbd803ace
] [formerly c6cb11a5f4
[formerly f88ff2bde9
] [formerly 8bbd803ace
] [formerly d8e5799328
[formerly 8bbd803ace
[formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0
[formerly 282d10fe6d
] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281
]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c
]
Former-commit-id: 1ca553385c
2014-01-06 14:08:08 -05:00
Steve Harris
f8f17037ca
14.1.1-14 baseline
...
Former-commit-id: 94a748fa8d
[formerly 6df7c67f95
] [formerly f2ad9da4eb
] [formerly 94a748fa8d
[formerly 6df7c67f95
] [formerly f2ad9da4eb
] [formerly 9ef1c841b9
[formerly f2ad9da4eb
[formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6
[formerly 0989c17710
] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d
]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1
]
Former-commit-id: 5862555160
2014-01-06 14:02:30 -05:00
Bryan Kowal
c8e49142f2
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
...
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: b2550c873b
[formerly 0c3b22c8f2
] [formerly 43008f4698
] [formerly b2550c873b
[formerly 0c3b22c8f2
] [formerly 43008f4698
] [formerly 120ebd045a
[formerly 43008f4698
[formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4
[formerly 68181d3f62
] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8
]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8
]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Brad Gonzales
d1fa8c738b
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
...
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 310597d856
[formerly 3d34764022
] [formerly 410a00c72a
] [formerly 310597d856
[formerly 3d34764022
] [formerly 410a00c72a
] [formerly 72df38075f
[formerly 410a00c72a
[formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]
Former-commit-id: 72df38075f
Former-commit-id: fa097589d0
[formerly e18f7b2380
] [formerly d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3
]]
Former-commit-id: e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58 [formerly 3d592d0b38
]
Former-commit-id: 143e160eae
2013-12-05 15:17:14 -06:00
Richard Peter
f362062048
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly 0c4ae068ad
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588
[formerly 60679a818a
] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4
]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e
]
Former-commit-id: ae6e34be4b
2013-12-05 12:12:27 -06:00
Benjamin Phillippe
aaf5dfbd62
Issue #2534 Added reciprocated registry replication subscriptions
...
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27
Former-commit-id: 67f6ee0999
[formerly f4144fca06
] [formerly 212bbeb379
] [formerly 67f6ee0999
[formerly f4144fca06
] [formerly 212bbeb379
] [formerly 31b53f4ad9
[formerly 212bbeb379
[formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 615b5ce605
[formerly 495f70a5cf
] [formerly 9bc982c030242d6a1ff819c729fdbb6438d12813 [formerly 2fa17aab7f
]]
Former-commit-id: d2bdc249c301c9e83e1cfcf57c2349d6f1571183 [formerly 878f9fe3ea
]
Former-commit-id: b39ef6ca2b
2013-11-27 12:07:59 -06:00
Ben Steffensmeier
34939645e4
Issue #2574 Add DataURIFieldConverter for GridCoverages.
...
Former-commit-id: 7202b4a232
[formerly cf6ef77d78
] [formerly 08be03d3fa
] [formerly 7202b4a232
[formerly cf6ef77d78
] [formerly 08be03d3fa
] [formerly bdb0e111ea
[formerly 08be03d3fa
[formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]]
Former-commit-id: bdb0e111ea
Former-commit-id: da8d574656
[formerly d8f5e957d3
] [formerly 5e670545fb6209a901b0d3032b1a1f721f3a2666 [formerly f7b1015dca
]]
Former-commit-id: 7d76ff708060d0943110de168a1630d627ddd6f2 [formerly b1de6a34eb
]
Former-commit-id: 5ee4468108
2013-11-25 12:17:36 -06:00
Brad Gonzales
ef39175130
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 2f37534433
[formerly 5576ac6134
] [formerly 053f20c70b
] [formerly 2f37534433
[formerly 5576ac6134
] [formerly 053f20c70b
] [formerly 95a1914c71
[formerly 053f20c70b
[formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]]
Former-commit-id: 95a1914c71
Former-commit-id: 3aa399c82e
[formerly 3c86e33ea4
] [formerly 19437f081eb72b80741e738e53af17b271610621 [formerly 04829d37e2
]]
Former-commit-id: abd02052274cc3ea864a223c7ac89c12b10c3e19 [formerly 6e19c4dab1
]
Former-commit-id: fc4850d7b2
2013-11-20 11:58:33 -06:00
Steve Harris
8a1ea4d35f
14.1.1-10 baseline
...
Former-commit-id: 69cef95302
[formerly 8251107646
] [formerly ca0f65bd9a
] [formerly 69cef95302
[formerly 8251107646
] [formerly ca0f65bd9a
] [formerly 9248695a1f
[formerly ca0f65bd9a
[formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac
[formerly e35ec60f7e
] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304
]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a
]
Former-commit-id: ea65181d19
2013-11-19 16:40:25 -05:00
Steve Harris
7facd4fe25
14.1.1-8 baseline
...
Former-commit-id: 8606fed724
[formerly 90bc008a50
] [formerly aa6c977e7b
] [formerly 8606fed724
[formerly 90bc008a50
] [formerly aa6c977e7b
] [formerly c7d36eb6ad
[formerly aa6c977e7b
[formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb
[formerly b7ca6163e3
] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9
]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a
]
Former-commit-id: d2104614be
2013-11-13 12:32:17 -05:00
Richard Peter
ff729f46b5
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 061fa07147
[formerly 7ba466f5a6
] [formerly 306bd6fae1
] [formerly 061fa07147
[formerly 7ba466f5a6
] [formerly 306bd6fae1
] [formerly 460a7b8b5d
[formerly 306bd6fae1
[formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c
[formerly 3f68fc6eed
] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d
]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295
]
Former-commit-id: ef23a8f65b
2013-11-12 11:11:36 -06:00
Bryan Kowal
74664b1def
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cots/edu.uci.ics.crawler4j/.classpath
cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
cots/edu.uci.ics.crawler4j/build.properties
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
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/GridToGribConverter.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1
Former-commit-id: f6b8d99e70
[formerly 3b8ce3fd34
] [formerly c3eb4e9af9
] [formerly f6b8d99e70
[formerly 3b8ce3fd34
] [formerly c3eb4e9af9
] [formerly f1cd2f2e5a
[formerly c3eb4e9af9
[formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: b2fb3cc71b
[formerly 464a8d1001
] [formerly 9832b7353c98edff371d73697564b1585403dd75 [formerly 1909193f0c
]]
Former-commit-id: bbe6693bef01b8fb05627cf015f2b987c0a64c90 [formerly dfba50bf2e
]
Former-commit-id: 9f749f3079
2013-11-08 14:51:47 -06:00
Brian Clements
01b43748e3
Issue #2515 upgraded camel from 2.11.0 to 2.11.2
...
removed log showBody workaround
Former-commit-id: b21233ec65
[formerly 6f0630aa55
] [formerly 4f374688c8
] [formerly b21233ec65
[formerly 6f0630aa55
] [formerly 4f374688c8
] [formerly ea6b162369
[formerly 4f374688c8
[formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]]
Former-commit-id: ea6b162369
Former-commit-id: 8feab3c298
[formerly 83edfb5349
] [formerly 82443edd368b60c7bbdfdc3a561f8cc96b1eb818 [formerly a5b61b6d22
]]
Former-commit-id: b12cec907353dc39ab55060375f514735f428cb0 [formerly 6772e50e80
]
Former-commit-id: 1369b5d57a
2013-11-07 16:56:25 -06:00
Richard Peter
0bcf000a31
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
...
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 1ba8eb3891
[formerly 25df870b67
] [formerly fa7d77ae97
] [formerly 1ba8eb3891
[formerly 25df870b67
] [formerly fa7d77ae97
] [formerly 93c776022a
[formerly fa7d77ae97
[formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: aec254aac0
[formerly c97efbf656
] [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02
]]
Former-commit-id: 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe [formerly 910464ea6a
]
Former-commit-id: 94e0faa6c6
2013-11-07 14:25:45 -06:00
Greg Armendariz
bbb5440109
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: b9a8dfd99f
[formerly 805783d8da
] [formerly da16b623e1
] [formerly b9a8dfd99f
[formerly 805783d8da
] [formerly da16b623e1
] [formerly 6456b3a17b
[formerly da16b623e1
[formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]]]
Former-commit-id: 6456b3a17b
Former-commit-id: 409990c09b
[formerly 88ec9027bc
] [formerly ece4acb7d4c6e6c8bc0fa11c3b4893ee1529b1dc [formerly 009c5771fd
]]
Former-commit-id: e59edb73dcfbdf8ec67c3727427ad1aaf61b7e80 [formerly 390d3b57e1
]
Former-commit-id: 35e634b5fa
2013-11-07 12:25:24 -06:00
Benjamin Phillippe
bda2b50c77
Issue #2530 Fixed ingest JVM crash on startup
...
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3
Former-commit-id: b0b0db8997
[formerly 8d47d1bbd4
] [formerly 7d605c471e
] [formerly b0b0db8997
[formerly 8d47d1bbd4
] [formerly 7d605c471e
] [formerly 3561293fdd
[formerly 7d605c471e
[formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]]]
Former-commit-id: 3561293fdd
Former-commit-id: 88ad5b8798
[formerly 1a8d9bf754
] [formerly 5916d9463f4f9e78b13a0ca2b1f25ea05c004a76 [formerly a9f8468c0e
]]
Former-commit-id: 721839ff39274d6d74267e59536d103416ec4a35 [formerly dc607f89b1
]
Former-commit-id: 64efd70b04
2013-11-07 10:38:53 -06:00
Steve Harris
b05c9a6aa2
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 626b91c9c7
[formerly 2a8e926976
] [formerly 108a4d908d
] [formerly 626b91c9c7
[formerly 2a8e926976
] [formerly 108a4d908d
] [formerly 1b3d4c8f67
[formerly 108a4d908d
[formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: b3f0cc869f
[formerly a6ae5f9c2f
] [formerly 8546b81d3f134c79637c6f5400cc76bdbfb21abe [formerly 50d60d8101
]]
Former-commit-id: d0d675db0d0de1c4bbc79b22fb517649fb9235ae [formerly 930b6ddb77
]
Former-commit-id: eec64a2dbc
2013-11-06 18:31:05 -06:00
Richard Peter
1dcfb3623b
Merge "Issue #2494 Updated to use thread logger" into development
...
Former-commit-id: ff8db01e5f
[formerly 3c49575ca0
] [formerly 22bd1521be
] [formerly ff8db01e5f
[formerly 3c49575ca0
] [formerly 22bd1521be
] [formerly 10160e3783
[formerly 22bd1521be
[formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]]]
Former-commit-id: 10160e3783
Former-commit-id: 17c915ea58
[formerly b10d5952c0
] [formerly fcaf2937a71343d6834a55f38f658f6c7fdbaa88 [formerly 88dbe31908
]]
Former-commit-id: e8555088e0c72303d6f761ef669d51817d7e2de9 [formerly 28744971c4
]
Former-commit-id: 70d5d65f35
2013-11-06 14:03:34 -06:00
Steve Harris
2608595d90
14.1.1-7 baseline
...
Former-commit-id: 21ff310620
[formerly 80614c0e52
] [formerly 3328e2dd1d
] [formerly 21ff310620
[formerly 80614c0e52
] [formerly 3328e2dd1d
] [formerly 4fff87723f
[formerly 3328e2dd1d
[formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6
[formerly b694612fe0
] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653
]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed
]
Former-commit-id: cfb3194426
2013-11-06 14:16:14 -05:00
Richard Peter
d2801eadb5
Issue #2499 : Fix build
...
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c
Former-commit-id: 10764ed800
[formerly 15fd2f7a55
] [formerly f3d8768b94
] [formerly 10764ed800
[formerly 15fd2f7a55
] [formerly f3d8768b94
] [formerly c09f68615c
[formerly f3d8768b94
[formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]]
Former-commit-id: c09f68615c
Former-commit-id: 40066061ee
[formerly 1b65a09a52
] [formerly 2caca803544425b06082edf14d9c7fc48db84b66 [formerly a653f9625a
]]
Former-commit-id: 1de821a71696b088539e4b3859b53d3eda3667d4 [formerly 3c129fb138
]
Former-commit-id: 463f09984a
2013-11-06 13:09:32 -06:00
Mike Duff
27409bd03a
Issue #2450 - Send notifications to Notification Center when subscriptions expire.
...
peer review comments
Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653
Former-commit-id: a3931125da
[formerly 2a97da896d
] [formerly 00bb57b481
] [formerly a3931125da
[formerly 2a97da896d
] [formerly 00bb57b481
] [formerly f3d07a9185
[formerly 00bb57b481
[formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]]]
Former-commit-id: f3d07a9185
Former-commit-id: 4a2d377291
[formerly ecaef4d639
] [formerly 34a98de0a9a5f176bd195b64d5d776dae48eef59 [formerly cc3846be0b
]]
Former-commit-id: 76ee46484cca60f12689d07b9d08fdf8fbbdbc0e [formerly 70fbb031a2
]
Former-commit-id: 8a8eb6ba4e
2013-11-06 12:23:09 -06:00
Dave Hladky
5e52684f9e
Issue #2494 Updated to use thread logger
...
Former-commit-id: 493083a836
[formerly 8be14ab6b0
] [formerly f890152abc
] [formerly 493083a836
[formerly 8be14ab6b0
] [formerly f890152abc
] [formerly 14469d6e22
[formerly f890152abc
[formerly 56505490277f53f77ad80e93aa6a31756a950db6]]]]
Former-commit-id: 14469d6e22
Former-commit-id: bbcccf221a
[formerly 4911d0b9c4
] [formerly 01427bbf31a9f9022b31a67d324f17fd8159e998 [formerly a2ff05afb9
]]
Former-commit-id: 0add07317c3415d3d604303521b42b73433b310b [formerly ae9bde9f57
]
Former-commit-id: 43dd4f308d
2013-11-06 08:26:25 -06:00
Bryan Kowal
19a648092a
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: 7f9f20c8a8
[formerly d73aaf9753
] [formerly 4bad21e6cd
] [formerly 7f9f20c8a8
[formerly d73aaf9753
] [formerly 4bad21e6cd
] [formerly 3255bf3861
[formerly 4bad21e6cd
[formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]]
Former-commit-id: 3255bf3861
Former-commit-id: b85c53c8b0
[formerly 400b4a1328
] [formerly fda65eb7f8713472578cb95e718895ab10e4b197 [formerly 76726372e5
]]
Former-commit-id: 5afe499eab30a20cc0a548514e8ce73b292bc5ca [formerly 748ab480fb
]
Former-commit-id: 2c31c6f4ab
2013-11-05 19:03:22 -06:00
Ben Steffensmeier
74a25404a0
Issue #2485 Remove ncccfp
...
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 3273b6fc5f
[formerly 4639cd69f4
] [formerly 5b53cb4c98
] [formerly 3273b6fc5f
[formerly 4639cd69f4
] [formerly 5b53cb4c98
] [formerly 1d35086e8d
[formerly 5b53cb4c98
[formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]]
Former-commit-id: 1d35086e8d
Former-commit-id: 41a54ad666
[formerly b64221f27b
] [formerly 5548cad8f6d7873bdd2beafefec42e2d00821e99 [formerly 8aefe5ff02
]]
Former-commit-id: ba475ead914b07016d89a22aaa936b7307336535 [formerly a97ec9b8e5
]
Former-commit-id: 5cf9a6ed01
2013-11-05 17:33:41 -06:00
Nate Jensen
02fdb50918
Merge "Issue #2520 - Update rpm query calls" into development
...
Former-commit-id: c846df9697
[formerly f5440862f3
] [formerly 183f46df4b
] [formerly c846df9697
[formerly f5440862f3
] [formerly 183f46df4b
] [formerly 76d21878e4
[formerly 183f46df4b
[formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]]
Former-commit-id: 76d21878e4
Former-commit-id: 8035a69b64
[formerly 131e6c803f
] [formerly 8737a75125579709844d32b9db60c1910275a9a1 [formerly e604ea08f6
]]
Former-commit-id: d8d8c9e937eea69cdef73530c9aee90b9f1d7edf [formerly 701fd08dd1
]
Former-commit-id: 10e392a7e3
2013-11-05 15:55:57 -06:00
Richard Peter
092714717f
Issue #2499 : Update Wes2Bridge Configuration and logging.
...
Change-Id: I95a530bc8b647c58cff36f449d55bff39943fbc9
Former-commit-id: d76bd3b8ae
[formerly 0566c1976e
] [formerly 73d0d1236c
] [formerly d76bd3b8ae
[formerly 0566c1976e
] [formerly 73d0d1236c
] [formerly 55b226e104
[formerly 73d0d1236c
[formerly 9449bc5f562fd638e0a02ea6c2dc4c6828e73561]]]]
Former-commit-id: 55b226e104
Former-commit-id: 324b57d843
[formerly 0a5323a740
] [formerly de953d3223b133cc7897e1be8e5c67e47a8bc0aa [formerly 0be00ed984
]]
Former-commit-id: 3ea403300e0a5d27621a5036bbace800af6b44f2 [formerly 0317d65b98
]
Former-commit-id: 5fb6587980
2013-11-05 15:08:23 -06:00
Greg Armendariz
2a365a1c76
Issue #2520 - Update rpm query calls
...
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024
Former-commit-id: 4bce15db12
[formerly 67ae7d2244
] [formerly 62324b5194
] [formerly 4bce15db12
[formerly 67ae7d2244
] [formerly 62324b5194
] [formerly b078f57dc7
[formerly 62324b5194
[formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]]
Former-commit-id: b078f57dc7
Former-commit-id: 403fa63efd
[formerly 9959fe56ae
] [formerly d4116fc6b4626874796f71816cf22b488b6628df [formerly f125f963b3
]]
Former-commit-id: feb4196537e2e11c66da3b64b721548e61419d14 [formerly 2c581c0c73
]
Former-commit-id: bb2f387371
2013-11-05 13:30:01 -06:00
Dave Hladky
fdf3928bf9
Issue #2494 Changed logging structure in DD
...
Former-commit-id: 5887e2ae3c
[formerly 042f5213f3
] [formerly cbe4572b65
] [formerly 5887e2ae3c
[formerly 042f5213f3
] [formerly cbe4572b65
] [formerly 180cf8b770
[formerly cbe4572b65
[formerly ddefe46379c9603bc4c8b603793c5053bce2b476]]]]
Former-commit-id: 180cf8b770
Former-commit-id: daaea66bef
[formerly 5ae6480a78
] [formerly a910fd84a65de0665ed7afd15e2f9c63f144e28a [formerly 32abcfccd2
]]
Former-commit-id: 6df87dc9000daee651033a4e0760102c8b26c0c0 [formerly f94d3eafd3
]
Former-commit-id: 061594260a
2013-11-04 16:35:49 -06:00
Greg Armendariz
6f74a2427d
Issue #2509 - Fix merge issue
...
Former-commit-id: 7ab7156b61
[formerly a281147055
] [formerly b4c3337ffd
] [formerly 7ab7156b61
[formerly a281147055
] [formerly b4c3337ffd
] [formerly fadf9346d2
[formerly b4c3337ffd
[formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]]
Former-commit-id: fadf9346d2
Former-commit-id: cbf9f6fe6b
[formerly 1561f091e3
] [formerly 4f461d5d2d81a6c8c37fb34ea3a2a847bafb9adc [formerly d530a65ee3
]]
Former-commit-id: 1bcfa976fd51ce58285b7672804c82c121a4a90f [formerly c90f8115f3
]
Former-commit-id: 3061eb1bc0
2013-11-01 10:31:08 -05:00
Bryan Kowal
6a0ddf11e4
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 5164a7c0b1
[formerly 38464427d3
] [formerly feaacd9356
] [formerly 5164a7c0b1
[formerly 38464427d3
] [formerly feaacd9356
] [formerly c8d7a32e2e
[formerly feaacd9356
[formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f
[formerly f02d4b7a0b
] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934
]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c
]
Former-commit-id: f5bb76a01e
2013-10-31 15:34:46 -05:00
Richard Peter
75ed6cd788
Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
...
Former-commit-id: 8b8f09f176
[formerly bfc87a0607
] [formerly fe45d2b7e6
] [formerly 8b8f09f176
[formerly bfc87a0607
] [formerly fe45d2b7e6
] [formerly b6ffed0066
[formerly fe45d2b7e6
[formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]]
Former-commit-id: b6ffed0066
Former-commit-id: b4c3c775f6
[formerly 5baa99e9c9
] [formerly d90ab5bca99a3ce62195970bf8966d8c71b5ec87 [formerly 4765eaefad
]]
Former-commit-id: a1d272f4a32086548120bb113252741efc701345 [formerly f1d5148c49
]
Former-commit-id: 5ee9b1ce9d
2013-10-29 12:15:35 -05:00
Bryan Kowal
71a8ee5a68
Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
...
Former-commit-id: 90a54524c6
[formerly df575b7be1
] [formerly a6d7822698
] [formerly 90a54524c6
[formerly df575b7be1
] [formerly a6d7822698
] [formerly cda8d04831
[formerly a6d7822698
[formerly 06a166ef6c963585eb65da223610a21665f9545a]]]]
Former-commit-id: cda8d04831
Former-commit-id: 3e68d9aaac
[formerly 27d2e33769
] [formerly 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9
]]
Former-commit-id: 822576469c2608f5a2fcb3645efe10ba1e12bfce [formerly 2615ad7324
]
Former-commit-id: 819cb0bcb7
2013-10-28 14:50:28 -05:00
Steve Harris
cbf859daf6
14.1.1-4 baseline
...
Former-commit-id: cb3b53f205
[formerly 82dec19b6a
] [formerly bd95bb6a4e
] [formerly cb3b53f205
[formerly 82dec19b6a
] [formerly bd95bb6a4e
] [formerly 99e3707c5b
[formerly bd95bb6a4e
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef
[formerly b60635cd70
] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e
]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42
]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711
14.1.1-3 baseline
...
Former-commit-id: a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly 94f24e0d8a
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d
[formerly aa59400b67
] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea
]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4
]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Brad Gonzales
5615d18d89
Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs
...
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.
Amend: Added excludes to sbnSimulator modes.
Updated FileUtil.listPaths to close the stream and use a LinkedList.
Added additional logging to SbnSimulator.
Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af
Former-commit-id: e4f3bcf7ee
[formerly 5145ec3dfe
] [formerly bd7e5d8940
] [formerly e4f3bcf7ee
[formerly 5145ec3dfe
] [formerly bd7e5d8940
] [formerly f7a635ebef
[formerly bd7e5d8940
[formerly f9e593974811896dec76c512c2a76b5769c7a68a]]]]
Former-commit-id: f7a635ebef
Former-commit-id: 1449b0270b
[formerly 88a20aeae1
] [formerly c3d8e35cadd5927e79213f8c47d73c2feded21ff [formerly c36cbae577
]]
Former-commit-id: ca087473a45f31140f4f6226a46edb5c8687e49f [formerly 9215426279
]
Former-commit-id: 3ad2195c50
2013-10-23 18:44:41 -05:00
Benjamin Phillippe
b5489e6213
Issue #1538 Reworked registry database connection strategy
...
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae
Former-commit-id: cf109fea6b
[formerly 16cf053ba9
] [formerly b192fd81c4
] [formerly cf109fea6b
[formerly 16cf053ba9
] [formerly b192fd81c4
] [formerly ef0d0e2393
[formerly b192fd81c4
[formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]]]
Former-commit-id: ef0d0e2393
Former-commit-id: ff5a939ffa
[formerly e2383dc624
] [formerly bb1aae881f66d72dc6ea40bef73dbcee83f6f04e [formerly 5aa04a9a43
]]
Former-commit-id: 7ec1a20cab1bdf1dd85607620fb380746fbb6648 [formerly bbd690038f
]
Former-commit-id: 720b125c30
2013-10-23 10:48:40 -05:00
Dave Hladky
2ea5c157b2
Issue #2466 Returned to original harvesterThreadPool
...
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d
Former-commit-id: 0c8360db45
[formerly 73aa2c69ac
] [formerly 1c37f0f765
] [formerly 0c8360db45
[formerly 73aa2c69ac
] [formerly 1c37f0f765
] [formerly beb0e573c1
[formerly 1c37f0f765
[formerly 534a6e392dab175f4e683af522c5e800cbb1391d]]]]
Former-commit-id: beb0e573c1
Former-commit-id: b57cadd40a
[formerly ef46aa1575
] [formerly 71bbc39b27da704277849a3577ea2b6de0371e48 [formerly 06ad289dc9
]]
Former-commit-id: 6f6a4e31ad3b70a836d935114ff38be603612650 [formerly 2453019703
]
Former-commit-id: 1eac3e62a0
2013-10-21 12:40:37 -05:00
Ben Steffensmeier
9a47690341
Issue #2402 decrease ingestGrib max memory.
...
Former-commit-id: def205a734
[formerly 127f7abab2
] [formerly ed88949e9d
] [formerly def205a734
[formerly 127f7abab2
] [formerly ed88949e9d
] [formerly 62177dcea7
[formerly ed88949e9d
[formerly e647c2bc33b696c1f45089e0d9560009071e34ef]]]]
Former-commit-id: 62177dcea7
Former-commit-id: 09b63a0bb9
[formerly 513e42c5cf
] [formerly 9e42f89a554c7fe7f8c96b569be4ad1d634ab20f [formerly ee7009f8cf
]]
Former-commit-id: fdf60c5f8c2f0affbac9eee6cebacc885481a219 [formerly 39e59f94b7
]
Former-commit-id: 6eb252133a
2013-10-17 12:30:10 -05:00
Dave Hladky
e9dec56920
Issue #2460 Product browser display of adhoc subscriptions
...
Change-Id: I9c045b781adb41468d395b67a837c9a862744447
Former-commit-id: e14b51258b
[formerly 7b6ef7ee9a
] [formerly 6076f46549
] [formerly e14b51258b
[formerly 7b6ef7ee9a
] [formerly 6076f46549
] [formerly 477fbd3d59
[formerly 6076f46549
[formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]]
Former-commit-id: 477fbd3d59
Former-commit-id: aa5fd1ba3f
[formerly 9880c82a36
] [formerly a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1
]]
Former-commit-id: c88b0194e09755a944f026679b6a3c33a0aad9c3 [formerly 8a1f070927
]
Former-commit-id: 33bd8d5cc4
2013-10-16 09:06:00 -05:00
Ben Steffensmeier
3af445a37a
Issue #2473 Remove unneeded ncgrib functionality.
...
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38
Former-commit-id: 0c0e339894
[formerly 10f74a1812
] [formerly d25df40634
] [formerly 0c0e339894
[formerly 10f74a1812
] [formerly d25df40634
] [formerly 51cd71c373
[formerly d25df40634
[formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]]
Former-commit-id: 51cd71c373
Former-commit-id: 50f81cf656
[formerly dcae8c6aa2
] [formerly 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677
]]
Former-commit-id: ec49165c9e367122a2e3115a12c8a3e00aa1dbca [formerly 92828fbaa0
]
Former-commit-id: 9ed413f0c2
2013-10-15 16:30:38 -05:00
Ben Steffensmeier
7a2089f2dc
Issue #2473 Remove deprecated grib functionality
...
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23
Former-commit-id: d5eaefeeed
[formerly c22ccb6c4c
] [formerly cfc8bb859f
] [formerly d5eaefeeed
[formerly c22ccb6c4c
] [formerly cfc8bb859f
] [formerly 94560e37c8
[formerly cfc8bb859f
[formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]]
Former-commit-id: 94560e37c8
Former-commit-id: 253ada50d5
[formerly c960405800
] [formerly f70cf023d739b92df09c9ab8e0c52a3bc0acf093 [formerly 2e0698aa06
]]
Former-commit-id: d5e54c8a6cadae9ca6e0e739c958b4f515534447 [formerly 2b831863c5
]
Former-commit-id: 2f9bc8f6de
2013-10-15 10:48:29 -05:00
Nate Jensen
239711078f
Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
...
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e
Former-commit-id: 2fb28dce46
[formerly d7e4576380
] [formerly b49a2ceb2f
] [formerly 2fb28dce46
[formerly d7e4576380
] [formerly b49a2ceb2f
] [formerly 40847d0edf
[formerly b49a2ceb2f
[formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]]
Former-commit-id: 40847d0edf
Former-commit-id: 9d1df167be
[formerly d84f47b609
] [formerly 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1
]]
Former-commit-id: c8ae0a88008c418e7419cfb8e0c8c5886ca02adc [formerly b506ef6a8d
]
Former-commit-id: bae5313482
2013-10-14 15:30:09 -05:00