Commit graph

516 commits

Author SHA1 Message Date
Brian Clements
39ab0e1a08 Omaha #2536 merged edex.textdb into text plugins
Former-commit-id: c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5b5295e5ad [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]
Former-commit-id: da7d5888b0
Former-commit-id: 909b50360144c1b7aaf549971a4592d7aee00d9c [formerly 003917f0ed]
Former-commit-id: e4bb70cbe9
2014-05-20 16:07:20 -05:00
Richard Peter
31e13940de Omaha #2782: Fix DD logging.
Change-Id: Id377941213f50ab2ea6f0c1e72a64579d126b168

Former-commit-id: 1a8b6a5410 [formerly 7fb6487460] [formerly 685ba4c0c5] [formerly b7e630bda7 [formerly 685ba4c0c5 [formerly b257c36bf2203e00e1f615a345b942987edfcf7a]]]
Former-commit-id: b7e630bda7
Former-commit-id: de93d493fa672eae0eb8129bb592b264d7afe756 [formerly 209e076385]
Former-commit-id: 0bdf468942
2014-05-19 12:41:09 -05:00
Nate Jensen
0a9d07c03e Omaha #3160 remove OBE ncep util plugins
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808

Former-commit-id: ba596d4848 [formerly 548d5ec519] [formerly bb1414677e] [formerly 5353d06ab6 [formerly bb1414677e [formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]]]
Former-commit-id: 5353d06ab6
Former-commit-id: ff4d9e2a307083ca04a656b025dc3e8ffe1dc55f [formerly 06d07c9ca4]
Former-commit-id: c7a0638666
2014-05-13 13:28:20 -05:00
Richard Peter
c7ed1a1a93 Omaha #1458: Remove reference to cron.properties
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29

Former-commit-id: c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly 0430619d7b [formerly 86aea04167 [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]
Former-commit-id: 0430619d7b
Former-commit-id: 1d72a41cca6b73062aea9ce9df36d0a583f99940 [formerly 02c77af062]
Former-commit-id: 328a48a33d
2014-05-08 12:58:49 -05:00
Richard Peter
899b8ce879 Omaha #1458: Break-out cron.properties.
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528

Former-commit-id: ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly 348bc25760 [formerly 6469ae94ed [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]
Former-commit-id: 348bc25760
Former-commit-id: a327ca6aece2679db79622f22c10369b6cebc586 [formerly 95488f49b1]
Former-commit-id: c9d8bfdd06
2014-05-08 09:18:49 -05:00
Richard Peter
e3e1298591 Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: 731f55d574 [formerly 242716fb0f] [formerly fbc4428b8c610d5f30f8d66655122d6b8da482af [formerly d5ec01f7c0]] [formerly adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]
Former-commit-id: adff7b5684
Former-commit-id: a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b]
Former-commit-id: 741710881f
2014-05-08 09:06:31 -05:00
Brian Clements
474068d56a Omaha #3116 changed log formatter class to match camel 2.12.3
Former-commit-id: 73b643e157 [formerly 170ce2c157] [formerly c77ba25dc8] [formerly 51eb6c9f06 [formerly c77ba25dc8 [formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: a092d2d161356b1089eedda592170e6720447ad2 [formerly b8a648f543]
Former-commit-id: 5b26766041
2014-05-06 11:38:38 -05:00
Brad Gonzales
58fda9c22a Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115

Former-commit-id: 0470903200 [formerly cbcd7dcc3e] [formerly df353f06f5] [formerly 39a2ec8f46 [formerly df353f06f5 [formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: 702f18abf50a79b37863af04c5f8463202ed6024 [formerly 78714c6ff7]
Former-commit-id: b33bd153f4
2014-05-02 13:09:57 -05:00
Richard Peter
0dfa8cc4c6 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]
Former-commit-id: 6966b79246
2014-04-28 16:27:40 -05:00
Richard Peter
947b9d7423 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 5c0f9b5ba5 [formerly 44701f31f2 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: 22e220f4dbde49d7ef5d1ef995a55d8c5ac54cff [formerly 60684de8b4]
Former-commit-id: baee58476f
2014-04-25 13:07:59 -05:00
Brian.Dyke
14a63a19e1 Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]
Former-commit-id: bf3758efa3
2014-04-25 11:06:11 -04:00
Richard Peter
b8c0ec3dc9 Issue #2726: Reduce excessive logging at startup
Change-Id: I350fe246fb0d08da900b3fb2a5708a94aefec0c4

Former-commit-id: f00d346389 [formerly 4110b921e5] [formerly 810b3737c6] [formerly 3e1f65e220 [formerly 810b3737c6 [formerly fd52ae21604814c665c2f5d7774c485d46747a5d]]]
Former-commit-id: 3e1f65e220
Former-commit-id: b777a35e9a7144305aa98ae128f80b953b91b795 [formerly 804110576e]
Former-commit-id: b60fe6dd3b
2014-04-22 15:54:41 -05:00
Brian.Dyke
9c4385efbe Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]
Former-commit-id: 6f35818917
2014-04-17 14:42:35 -04:00
Nate Jensen
6c02a78f95 Issue #2984 remove dead ncep purge util plugin and web page
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829

Former-commit-id: 55ed6aa760 [formerly c81c44d15f] [formerly e081847225] [formerly 7726f144ed [formerly e081847225 [formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]]]
Former-commit-id: 7726f144ed
Former-commit-id: 65f09770f2a186fb119737c7f34c08d45089e7d3 [formerly 56e7b21e35]
Former-commit-id: 5ca97d5798
2014-04-15 11:16:24 -05:00
Nate Jensen
134f34c4df Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]
Former-commit-id: dfe50ee038
2014-04-14 14:28:11 -05:00
Richard Peter
b5fa843960 Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]
Former-commit-id: ff87317bd4
2014-04-14 13:10:11 -05:00
Richard Peter
56089894f2 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]
Former-commit-id: d65b11d404
2014-04-11 16:23:09 -05:00
Richard Peter
47795836f2 Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]
Former-commit-id: f1b85f6964
2014-04-09 16:00:54 -05:00
Ron Anderson
454323fd74 Issue #2694 Converted GetBrokerConnections to Java.
Change-Id: Ic9445906ed88036d6598ffec0319de9c89f8c163

Former-commit-id: 7c9f4091c2 [formerly d16380e50e] [formerly a6794beaa5] [formerly df9c5c81d6 [formerly a6794beaa5 [formerly 102c81e1aafdcfa171440df1cba97d27b2ba3c2a]]]
Former-commit-id: df9c5c81d6
Former-commit-id: 7524b26cc572e199e0f694889a08af77618fbbde [formerly d778e9dac6]
Former-commit-id: d1cb494222
2014-04-07 15:18:01 -05:00
Brian.Dyke
8ba2694d8e Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]
Former-commit-id: 47d9095211
2014-04-04 12:57:32 -04:00
David Friedman
1e4ac84f99 Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]
Former-commit-id: 1168a3eae5
2014-03-27 19:17:03 +00:00
Ron Anderson
fb564d8275 Issue #2664 Added support for non-WGS84 shape files
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: b08d5dfe21 [formerly c9e456983b] [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 1b39ed7771 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: 4fef82c9075c140b26c17875dcbc2c745ae87cba [formerly 65d4400471]
Former-commit-id: 527399107f
2014-03-27 13:04:44 -05:00
Ron Anderson
291504f08d Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly d1b36c4a72 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]
Former-commit-id: dd8bfdf941
Former-commit-id: 4689925288bb72398ed1efadbc5c3d15c54a177e [formerly b82cf065b5]
Former-commit-id: f24f542137
2014-03-13 11:54:15 -05:00
Ron Anderson
cbd408ce4e 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: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]
Former-commit-id: 06b0b5b684
2014-03-13 11:11:53 -05:00
Steve Harris
edeb1833ae Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
2014-03-07 15:43:40 -06:00
Brad Gonzales
5fae9e6577 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: 770f675138 [formerly cb89c806c8] [formerly 08ee82c39a] [formerly b535c90a23 [formerly 08ee82c39a [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]
Former-commit-id: b535c90a23
Former-commit-id: 11734a11ae5f09b05df469fcfb5ec781a7813557 [formerly e54ab69bf7]
Former-commit-id: 48b19f3833
2014-03-06 10:38:30 -06:00
Steve Harris
d2a6b0c18b 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: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]
Former-commit-id: 587f15a95d
2014-03-06 08:39:43 -06:00
Nate Jensen
1a21140770 Issue #2627 shorten wrapper arg for retaining failed data
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7

Former-commit-id: ee84466b3c [formerly ad7d5a745b] [formerly c07f2e829d] [formerly 0dc5dfae82 [formerly c07f2e829d [formerly 54578116023ebc7a6474a3297d419c2777d31e17]]]
Former-commit-id: 0dc5dfae82
Former-commit-id: 3ed2948010b10a83db8a0e121f679148f5130c8c [formerly 08ac542f2f]
Former-commit-id: d3a10ba1e6
2014-03-05 09:04:10 -06:00
Brian.Dyke
c1ef56e0d7 OB_14.1.1-21 baseline
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]
Former-commit-id: 29681c7ca4
Former-commit-id: 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]
Former-commit-id: c68649b4f9
2014-03-04 11:47:42 -05:00
Brian Clements
11b30001d5 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: 769ee18145 [formerly a738448825] [formerly 443f420c0e6fc38c2a3fdd4e4aa68d8a8fb91db6 [formerly 3b6121b9fa]] [formerly 934ce73e4b [formerly 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 066c81f999fa0b82f0f2cf806a4411393bd5ac3c [formerly a44c5f8d48]
Former-commit-id: 75c179b06f
2014-03-03 14:07:01 -06:00
Nate Jensen
ce34239347 Merge "Issue #2823 deploy install now defaults to x86_64." into development
Former-commit-id: 1a94acc527 [formerly 82817c2cbd] [formerly f7b4c75f13] [formerly d7a8ddbb83 [formerly f7b4c75f13 [formerly 75be0d86a588209ff572362f098095beb0b618d2]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: 925ea42657cfdc93cc2d496f645202a2d2a00011 [formerly 35ea5b9eb2]
Former-commit-id: c439ecb2a4
2014-02-27 16:44:26 -06:00
Brad Gonzales
78cafe46d5 Issue #2823 deploy install now defaults to x86_64.
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc

Former-commit-id: f84150e7a0 [formerly 73ed932660] [formerly 2135663934] [formerly 45160326aa [formerly 2135663934 [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]
Former-commit-id: 45160326aa
Former-commit-id: 198c4e59dcbb38b466db464ed3ce8ffb0ea02484 [formerly 90e6558083]
Former-commit-id: 003f028176
2014-02-27 16:34:53 -06:00
Richard Peter
1d6e9816e0 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: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]
Former-commit-id: 50a1b270c5
2014-02-27 15:18:26 -06:00
Brian.Dyke
5a11fbbfdb OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]
Former-commit-id: c41dd22ff2
2014-02-21 06:50:59 -05:00
David Gillingham
b373d71852 Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: d751bcbb04dc8d77626c940f99e5f7ad3f73874d [formerly 1520317c24]
Former-commit-id: a83191356d
2014-02-18 13:24:37 -06:00
Brad Gonzales
ae35320dd6 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: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]
Former-commit-id: 1b76488111
2014-02-18 11:10:44 -06:00
Michael Gamazaychikov
affc8cbf35 ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed

Former-commit-id: 7531090e3d [formerly 8cd5cce89e] [formerly 42399284ca] [formerly b63053d8b4 [formerly 42399284ca [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]]
Former-commit-id: b63053d8b4
Former-commit-id: 57d29eaf78d9034dfe9ee098e919a613c40d6647 [formerly 60de3bbc43]
Former-commit-id: 293dd963f1
2014-02-11 01:32:37 +00:00
Steve Harris
116d836ab3 Merge branch 'omaha_14.2.1' into development
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: f1a9ec2d1e [formerly ae2b849157] [formerly f59a8466de6460c73da06c85dae5790c93c14949 [formerly 7a156e297a]] [formerly 7b59bd41eb [formerly 7a156e297a [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 675dc12528eb749e423c405fa15dbe8b66201362 [formerly aa9b488963]
Former-commit-id: 4a379aa6e5
2014-02-03 10:29:16 -06:00
Steve Harris
ae4332665e Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906]
Former-commit-id: 6883c64744
2014-02-03 10:26:11 -06:00
Steve Harris
cdb99cc3e0 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: f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly 1aea63a1f6 [formerly 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f]
Former-commit-id: d9cd003a5a
2014-01-29 09:41:57 -06:00
Stephen Gilbert
023ac1960f Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 7383aa8502 [formerly 53fa8822e0] [formerly 6785474b17] [formerly b64adbed81 [formerly 6785474b17 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]
Former-commit-id: b64adbed81
Former-commit-id: 9726e54239f843bd384b3ad71761a58541ba9389 [formerly d947a0e7c1]
Former-commit-id: 511123b38c
2014-01-27 14:20:47 -05:00
Brad Gonzales
07eac8a84d 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: 208d18e28e [formerly afbaf72617] [formerly e94023097e] [formerly 02f9fd20dc [formerly e94023097e [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 44dcb29c662d33832c30a88262faccc81d37a10a [formerly a40afbe8ac]
Former-commit-id: 71a32928d9
2014-01-26 20:31:38 -06:00
Stephen Gilbert
2e2034bb1d 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: e64020e271 [formerly 185f06495f] [formerly a12b83ddfb] [formerly 2bd1588ad4 [formerly a12b83ddfb [formerly f64ce96da2871e55b40b6fe4ba0e77eaed266103]]]
Former-commit-id: 2bd1588ad4
Former-commit-id: ed33756c50a2ab718a474d22ed268e2af3dd027b [formerly cfa9fdb6cf]
Former-commit-id: 081ef1a246
2014-01-24 10:14:17 -05:00
Nate Jensen
0dc8c42f79 Issue #2359 updated readme with bscalio suggestions
Change-Id: I25356e9c6e89473a5442ca1bfdab29b41a996694

Former-commit-id: 0353f43d54 [formerly e2c9407815] [formerly 90a7339f6d] [formerly b08d9d4932 [formerly 90a7339f6d [formerly 2c9c6f8aee77f96911d698bc2031af5e01f03ee0]]]
Former-commit-id: b08d9d4932
Former-commit-id: 8ef8108641d6f4ff98dde53bba62abfb54e59fe6 [formerly 3f4c9a1d05]
Former-commit-id: 2b54a41e8d
2014-01-23 09:25:37 -06:00
Nate Jensen
395f94a124 Issue #2627 configurable ability to retain failed data, log 'expected'
failures as infos without stacktraces

Change-Id: I199c2125bb6c35b703b71ac5e8342d7c0a4dbcb0

Former-commit-id: fe0af876a8 [formerly 84f2de90fb] [formerly ed8b9d12ca420d21e3c923fd690db388c1211ea9 [formerly 36ad567a6d]] [formerly 50b6eced5d [formerly 36ad567a6d [formerly 0a1049cb785f782fe7bea8379f7df694dfb45e23]]]
Former-commit-id: 50b6eced5d
Former-commit-id: dee3026680a5d184d1367b507b9d4ed3f87bdc3a [formerly a021248cf3]
Former-commit-id: 8cb4767783
2014-01-22 09:27:46 -06:00
Steve Harris
6cb92b1f57 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 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
2014-01-21 12:36:54 -06:00
Ron Anderson
9b8c8310ab Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]
Former-commit-id: 66bbc99784
Former-commit-id: c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]
Former-commit-id: 0048ef6a96
2014-01-20 17:22:26 -06:00
Steve Harris
9843517cb3 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 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]
Former-commit-id: 7ea285c48b
2014-01-20 10:17:44 -06:00
Richard Peter
73b61633e2 Issue #2125: Clean up hibernate warnings
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e

Former-commit-id: d7e7ca2e26 [formerly f30181d730] [formerly e2d20753e1] [formerly 0c058f461c [formerly e2d20753e1 [formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]]]
Former-commit-id: 0c058f461c
Former-commit-id: 3b734e85284d24a2773d8ffa7aec5062ace9f74d [formerly 7054a06acb]
Former-commit-id: caa06ce1e1
2014-01-17 14:12:34 -06:00
Brian Clements
32bd012ee7 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 6e53de073a94c9b810c2001d7fc32c51ea169920 [formerly 3959c9e023]] [formerly 1a5991dcf5 [formerly 3959c9e023 [formerly 2b16524026b3c8834e5846f8cd800ae4e1a95e07]]]
Former-commit-id: 1a5991dcf5
Former-commit-id: 8e0e1ea619f2364f9bacc1be3d52e01d6a4500f8 [formerly f0b260d1ce]
Former-commit-id: 1708f1c350
2014-01-14 08:43:21 -06:00