Ron Anderson
646c62a8ba
Issue #2664 Added support for non-WGS84 shape files
...
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951
Former-commit-id: b08d5dfe21c9e456983b1b39ed7771b08d5dfe21c9e456983b1b39ed77714c6cddc7d41b39ed77714c6cddc7d4fb564d8275527399107f65d44004718f6c261d0db92df6757a
2014-03-27 13:04:44 -05:00
Ron Anderson
be71fd9775
Issue #2909 Remove useLegacyMergeSort java parameter
...
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a
Former-commit-id: 010666a971f921b5c83bd1b36c4a72010666a971f921b5c83bd1b36c4a72dd8bfdf941d1b36c4a72dd8bfdf941291504f08df24f542137b82cf065b52bf7b94fe41ed943032d
2014-03-13 11:54:15 -05:00
Ron Anderson
9accd00e1f
Issue #2718 Update to GeoTools 10.5
...
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: d752e068c7ab69d3e3181c727465eed752e068c7ab69d3e3181c727465eebcfaf40ebf1c727465eebcfaf40ebfcbd408ce4e06b0b5b6844b2a3886284ffc16ce5398e22f6e59
2014-03-13 11:11:53 -05:00
Steve Harris
9c0f484340
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b151b755a476873bd6b889865fef97b151b755a476873bd6b889f60aba35d6873bd6b889f60aba35d6edeb1833aec24108e75b708485427e61af779433ed7921643c
2014-03-07 15:43:40 -06:00
Brad Gonzales
5b7c0dc9c2
Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7.
...
Amend: changed to use set method.
Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1
Former-commit-id: 770f675138cb89c806c808ee82c39a770f675138cb89c806c808ee82c39ab535c90a2308ee82c39ab535c90a235fae9e657748b19f3833e54ab69bf7f122bb7ac9650897cef1
2014-03-06 10:38:30 -06:00
Steve Harris
a19beb1e5d
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e93ba28aabea069093884f52226061e93ba28aabea069093884fffcc34f8d4069093884fffcc34f8d4d2a6b0c18b587f15a95d96658d8ce036a0533f192db5dcf6eb
2014-03-06 08:39:43 -06:00
Nate Jensen
a812bac9d0
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: ee84466b3cad7d5a745bc07f2e829dee84466b3cad7d5a745bc07f2e829d0dc5dfae82c07f2e829d0dc5dfae821a21140770d3a10ba1e608ac542f2f838a3e9dd8df3a5c02e5
2014-03-05 09:04:10 -06:00
Brian.Dyke
c8111a7ebb
OB_14.1.1-21 baseline
...
Former-commit-id: 5179a4f970271ec85c0c1d92e5bab65179a4f970271ec85c0c1d92e5bab629681c7ca41d92e5bab629681c7ca4c1ef56e0d7c68649b4f97cad374af5079cc93f89ea56516bf5
2014-03-04 11:47:42 -05:00
Brian Clements
08c686bfa7
Issue #2756 install script for collaboration http server
...
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars
Former-commit-id: 769ee18145a7384488253b6121b9fa769ee18145a7384488253b6121b9fa934ce73e4b3b6121b9fa934ce73e4b11b30001d575c179b06fa44c5f8d48a36f303646861716341a
2014-03-03 14:07:01 -06:00
Nate Jensen
0dce8ad18f
Merge "Issue #2823 deploy install now defaults to x86_64." into development
...
Former-commit-id: 1a94acc52782817c2cbdf7b4c75f131a94acc52782817c2cbdf7b4c75f13d7a8ddbb83f7b4c75f13d7a8ddbb83ce34239347c439ecb2a435ea5b9eb28b7fecdd99d286ba624c
2014-02-27 16:44:26 -06:00
Brad Gonzales
8cc15b1c3b
Issue #2823 deploy install now defaults to x86_64.
...
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc
Former-commit-id: f84150e7a073ed9326602135663934f84150e7a073ed932660213566393445160326aa213566393445160326aa78cafe46d5003f02817690e6558083b6dbc7f605562245f2af
2014-02-27 16:34:53 -06:00
Richard Peter
ef2ff1d0f7
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a7bd6a079130e25ae35c179d3aa4e1a7bd6a079130e25ae35c11c150e6e8b0e25ae35c11c150e6e8b1d6e9816e050a1b270c5f13c86bc3e9b3f8f96495fab51d41b
2014-02-27 15:18:26 -06:00
Brian.Dyke
de9e6553a9
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5779553142ccfa49979783508e488f5779553142ccfa499797810b723647bcfa499797810b723647b5a11fbbfdbc41dd22ff264044e7ce51b359c2564f86f9f8918
2014-02-21 06:50:59 -05:00
David Gillingham
da665e15b0
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 43733c77eb607ce13c1932719432ff43733c77eb607ce13c1932719432ffde12904c7a32719432ffde12904c7ab373d71852a83191356d1520317c24474dda75de5911f4b2d4
2014-02-18 13:24:37 -06:00
Brad Gonzales
e906d71ac4
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: 1d57e9f5f7379c0fb46c19460ed0d71d57e9f5f7379c0fb46c19460ed0d7ba4e30832819460ed0d7ba4e308328ae35320dd61b764881113be33809449aa1cb299eb0421675ff
2014-02-18 11:10:44 -06:00
Steve Harris
95a936e9dc
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: f1a9ec2d1eae2b8491577a156e297af1a9ec2d1eae2b8491577a156e297a7b59bd41eb7a156e297a7b59bd41eb116d836ab34a379aa6e5aa9b488963b9af02c0b3e6cab2a902
2014-02-03 10:29:16 -06:00
Steve Harris
b016112b8f
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: ab0609007c131af8538eb2032880acab0609007c131af8538eb2032880aceb9d4319dcb2032880aceb9d4319dcae4332665e6883c6474433aea09906d8989145ac08700a77b1
2014-02-03 10:26:11 -06:00
Steve Harris
fb3a30b3b3
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java
Former-commit-id: f562540e7c14ba3b29f41738185503f562540e7c14ba3b29f417381855031aea63a1f617381855031aea63a1f6cdb99cc3e0d9cd003a5a1fd5b2255fec69a2c4f7e3d1abe909
2014-01-29 09:41:57 -06:00
Stephen Gilbert
ea7563f109
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 7383aa850253fa8822e06785474b177383aa850253fa8822e06785474b17b64adbed816785474b17b64adbed81023ac1960f511123b38cd947a0e7c14cd6847849f7c1bee352
2014-01-27 14:20:47 -05:00
Brad Gonzales
7e84f1a451
Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
...
Amend: update from peer review.
Change-Id: I1986de99319fdecd21a94579c499266b048d382a
Former-commit-id: 208d18e28eafbaf72617e94023097e208d18e28eafbaf72617e94023097e02f9fd20dce94023097e02f9fd20dc07eac8a84d71a32928d9a40afbe8acf7c3c8c83d7707be3dcd
2014-01-26 20:31:38 -06:00
Stephen Gilbert
f62797e088
VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1
...
Updates to GRIB decoder tables.
Changes to some decoder plugins to support data ingest through qpid.
Change-Id: Id42e993b1ac76040ad19c970c43036d3f852def0
Former-commit-id: e64020e271185f06495fa12b83ddfbe64020e271185f06495fa12b83ddfb2bd1588ad4a12b83ddfb2bd1588ad42e2034bb1d081ef1a246cfa9fdb6cf6ef117ac7de75a572abf
2014-01-24 10:14:17 -05:00
Nate Jensen
2cb7388e4a
Issue #2359 updated readme with bscalio suggestions
...
Change-Id: I25356e9c6e89473a5442ca1bfdab29b41a996694
Former-commit-id: 0353f43d54e2c940781590a7339f6d0353f43d54e2c940781590a7339f6db08d9d493290a7339f6db08d9d49320dc8c42f792b54a41e8d3f4c9a1d05f3b1369a324581c9c2bd
2014-01-23 09:25:37 -06:00
Nate Jensen
508d73d545
Issue #2627 configurable ability to retain failed data, log 'expected'
...
failures as infos without stacktraces
Change-Id: I199c2125bb6c35b703b71ac5e8342d7c0a4dbcb0
Former-commit-id: fe0af876a884f2de90fb36ad567a6dfe0af876a884f2de90fb36ad567a6d50b6eced5d36ad567a6d50b6eced5d395f94a1248cb4767783a021248cf34e651964c0f023e45fa6
2014-01-22 09:27:46 -06:00
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: 56f5ae9f48a465718a0d24ab7cff4956f5ae9f48a465718a0d24ab7cff4969dc3d835b24ab7cff4969dc3d835b6cb92b1f57b62efa9387252c7ee40a2a967fc9b569626ab704
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: a481848c6734d1b95a79de97ec032fa481848c6734d1b95a79de97ec032f66bbc99784de97ec032f66bbc997849b8c8310ab0048ef6a9661d8aec23c841504f145385547a5e5
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: 002b2492ac5fcccbff1b454d557884002b2492ac5fcccbff1b454d5578849371eeeee0454d5578849371eeeee09843517cb37ea285c48b0ba307d616b5f7f35ccbccd2f6cdaa
2014-01-20 10:17:44 -06:00
Richard Peter
097d4ff977
Issue #2125 : Clean up hibernate warnings
...
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e
Former-commit-id: d7e7ca2e26f30181d730e2d20753e1d7e7ca2e26f30181d730e2d20753e10c058f461ce2d20753e10c058f461c73b61633e2caa06ce1e17054a06acbed1bc96a6352e1cbf540
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: 16b34af5a8f1c3efdd0e3959c9e02316b34af5a8f1c3efdd0e3959c9e0231a5991dcf53959c9e0231a5991dcf532bd012ee71708f1c350f0b260d1ced62dd50b7bb18c7dcee6
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: 2e8cbade9f0bde38cef3ba7a25a88f2e8cbade9f0bde38cef3ba7a25a88f62c445d872ba7a25a88f62c445d87246735c9afedca7f21f7b624375267e5076217d8f77c132f706
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: 2c0c6fbcc78eeb3dc4124537513df72c0c6fbcc78eeb3dc4124537513df7343a2495e54537513df7343a2495e56868d8d12df57529be9b4049af96308b362ee404b8c7be1225
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: c05358aac502910c2a8c07a4420596c05358aac502910c2a8c07a442059612860c79f907a442059612860c79f9ad3da98af65c85734e02be6f12e9c2a1ee60d16d44cff7514d
2014-01-08 13:37:17 -06:00
Steve Harris
e44faa7943
14.1.1-15 baseline
...
Former-commit-id: c6cb11a5f4f88ff2bde98bbd803acec6cb11a5f4f88ff2bde98bbd803aced8e57993288bbd803aced8e5799328188b12a1b0282d10fe6d35d8f5a281cd4a09623c1ca553385c
2014-01-06 14:08:08 -05:00
Steve Harris
f8f17037ca
14.1.1-14 baseline
...
Former-commit-id: 94a748fa8d6df7c67f95f2ad9da4eb94a748fa8d6df7c67f95f2ad9da4eb9ef1c841b9f2ad9da4eb9ef1c841b94a516444b60989c1771043cc501e0da2bdee5cc15862555160
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: b2550c873b0c3b22c8f243008f4698b2550c873b0c3b22c8f243008f4698120ebd045a43008f4698120ebd045aa63bda59b468181d3f62fac9d72cc89e0e6662c8fad82481c1
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: 310597d8563d34764022410a00c72a310597d8563d34764022410a00c72a72df38075f410a00c72a72df38075ffa097589d0e18f7b2380c54fe467a33d592d0b38143e160eae
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: ba577ff354b3b23647b40c4ae068adba577ff354b3b23647b40c4ae068ada0b6ea8bb20c4ae068ada0b6ea8bb2530b3bd58860679a818ada027298d4fd93b7d85eae6e34be4b
2013-12-05 12:12:27 -06:00
Benjamin Phillippe
aaf5dfbd62
Issue #2534 Added reciprocated registry replication subscriptions
...
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27
Former-commit-id: 67f6ee0999f4144fca06212bbeb37967f6ee0999f4144fca06212bbeb37931b53f4ad9212bbeb37931b53f4ad9615b5ce605495f70a5cf2fa17aab7f878f9fe3eab39ef6ca2b
2013-11-27 12:07:59 -06:00
Ben Steffensmeier
34939645e4
Issue #2574 Add DataURIFieldConverter for GridCoverages.
...
Former-commit-id: 7202b4a232cf6ef77d7808be03d3fa7202b4a232cf6ef77d7808be03d3fabdb0e111ea08be03d3fabdb0e111eada8d574656d8f5e957d3f7b1015dcab1de6a34eb5ee4468108
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: 2f375344335576ac6134053f20c70b2f375344335576ac6134053f20c70b95a1914c71053f20c70b95a1914c713aa399c82e3c86e33ea404829d37e26e19c4dab1fc4850d7b2
2013-11-20 11:58:33 -06:00
Steve Harris
8a1ea4d35f
14.1.1-10 baseline
...
Former-commit-id: 69cef953028251107646ca0f65bd9a69cef953028251107646ca0f65bd9a9248695a1fca0f65bd9a9248695a1f2c49ed51ace35ec60f7eef6e0b030436d788890aea65181d19
2013-11-19 16:40:25 -05:00
Steve Harris
7facd4fe25
14.1.1-8 baseline
...
Former-commit-id: 8606fed72490bc008a50aa6c977e7b8606fed72490bc008a50aa6c977e7bc7d36eb6adaa6c977e7bc7d36eb6ad1902ca9cfbb7ca6163e30123596fd942ece4fb6ad2104614be
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: 061fa071477ba466f5a6306bd6fae1061fa071477ba466f5a6306bd6fae1460a7b8b5d306bd6fae1460a7b8b5d112816a54c3f68fc6eed59671c1e7dc8ef435295ef23a8f65b
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: f6b8d99e703b8ce3fd34c3eb4e9af9f6b8d99e703b8ce3fd34c3eb4e9af9f1cd2f2e5ac3eb4e9af9f1cd2f2e5ab2fb3cc71b464a8d10011909193f0cdfba50bf2e9f749f3079
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: b21233ec656f0630aa554f374688c8b21233ec656f0630aa554f374688c8ea6b1623694f374688c8ea6b1623698feab3c29883edfb5349a5b61b6d226772e50e801369b5d57a
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: 1ba8eb389125df870b67fa7d77ae971ba8eb389125df870b67fa7d77ae9793c776022afa7d77ae9793c776022aaec254aac0c97efbf656520dd57f02910464ea6a94e0faa6c6
2013-11-07 14:25:45 -06:00
Greg Armendariz
bbb5440109
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: b9a8dfd99f805783d8dada16b623e1b9a8dfd99f805783d8dada16b623e16456b3a17bda16b623e16456b3a17b409990c09b88ec9027bc009c5771fd390d3b57e135e634b5fa
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: b0b0db89978d47d1bbd47d605c471eb0b0db89978d47d1bbd47d605c471e3561293fdd7d605c471e3561293fdd88ad5b87981a8d9bf754a9f8468c0edc607f89b164efd70b04
2013-11-07 10:38:53 -06:00
Steve Harris
b05c9a6aa2
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 626b91c9c72a8e926976108a4d908d626b91c9c72a8e926976108a4d908d1b3d4c8f67108a4d908d1b3d4c8f67b3f0cc869fa6ae5f9c2f50d60d8101930b6ddb77eec64a2dbc
2013-11-06 18:31:05 -06:00
Richard Peter
1dcfb3623b
Merge "Issue #2494 Updated to use thread logger" into development
...
Former-commit-id: ff8db01e5f3c49575ca022bd1521beff8db01e5f3c49575ca022bd1521be10160e378322bd1521be10160e378317c915ea58b10d5952c088dbe3190828744971c470d5d65f35
2013-11-06 14:03:34 -06:00
Steve Harris
2608595d90
14.1.1-7 baseline
...
Former-commit-id: 21ff31062080614c0e523328e2dd1d21ff31062080614c0e523328e2dd1d4fff87723f3328e2dd1d4fff87723f4d2f53ebc6b694612fe048df058653647b908fedcfb3194426
2013-11-06 14:16:14 -05:00
