Steve Harris
3c8bfc8160
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 3619a11a8a
[formerly bddf9c0f27
] [formerly 793064063b
] [formerly 3619a11a8a
[formerly bddf9c0f27
] [formerly 793064063b
] [formerly 5d58625abc
[formerly 793064063b
[formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762
[formerly 66b485c000
] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f
]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457
]
Former-commit-id: ecf26b3ac5
2014-08-29 10:17:52 -05:00
Brian.Dyke
2da6c7b93b
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457
[formerly a08db8d73d
] [formerly e654318431
] [formerly 0a5ddf7457
[formerly a08db8d73d
] [formerly e654318431
] [formerly aa83bf804f
[formerly e654318431
[formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1
[formerly f90649d7e7
] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb
]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda
]
Former-commit-id: 7e4ab705cc
2014-08-27 11:19:19 -04:00
Nate Jensen
f7ae70ac02
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: d61c65787b
[formerly 253198b5bc
] [formerly b3083a663e
] [formerly d61c65787b
[formerly 253198b5bc
] [formerly b3083a663e
] [formerly 9b72a1399d
[formerly b3083a663e
[formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88
[formerly 58a4cb95c1
] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a
]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d
]
Former-commit-id: 7336692b85
2014-08-14 10:22:37 -05:00
Nate Jensen
8130878a82
Issue #3497 refactored syntax check to prevent infinite loop possibility
...
and apply some sanity
Change-Id: I8118a99729c75fc756313db13654f34087a1e648
Former-commit-id: 177d7cffce
[formerly e9ad8ac975
] [formerly 026df22018
] [formerly 177d7cffce
[formerly e9ad8ac975
] [formerly 026df22018
] [formerly 389ae22829
[formerly 026df22018
[formerly b080e8ef12dc3223b1676b97bc153f9422657514]]]]
Former-commit-id: 389ae22829
Former-commit-id: 999a1f19df
[formerly 339f8ef0e3
] [formerly fa346bc0651c11ea01ffcb4ee89ace60ddcd7794 [formerly cff90cfe7e
]]
Former-commit-id: 9563cc7c6269497dc1f3a7409100f287001c9ec1 [formerly 7c12ec9b4b
]
Former-commit-id: 4e70a557fc
2014-08-13 16:13:31 -05:00
Brian Clements
fca22ac79b
Omaha #3502 common.util changes
...
moved ConvertUtil, reworked StringUtil.split()
Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03
Former-commit-id: d7defbe7ca
[formerly 4d3bb07573
] [formerly c3e1b5c9a2
] [formerly d7defbe7ca
[formerly 4d3bb07573
] [formerly c3e1b5c9a2
] [formerly fc322a74b2
[formerly c3e1b5c9a2
[formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]]]]
Former-commit-id: fc322a74b2
Former-commit-id: 402c8624eb
[formerly 809d40d388
] [formerly e3510853254b673603c5eabacd355283ff8561a6 [formerly fa89fae529
]]
Former-commit-id: 59a702eab36adde13d4b60ed2b7b8dd1f26f2485 [formerly 62f529ebe2
]
Former-commit-id: 54c861d870
2014-08-07 16:48:57 -05:00
Steve Harris
8bce1903ec
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.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/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: d606269c5b
[formerly a92dc418c6
] [formerly 0fb743ec44
] [formerly d606269c5b
[formerly a92dc418c6
] [formerly 0fb743ec44
] [formerly bf9a0fa5de
[formerly 0fb743ec44
[formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: 386dfebe65
[formerly b848e05aa1
] [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d [formerly 46fe792d83
]]
Former-commit-id: 5636830e013729a270565af661d066aa2f000390 [formerly 5e2f7a9f74
]
Former-commit-id: a0fdc76880
2014-08-04 22:20:29 -05:00
Brian.Dyke
1d9494a502
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 590e37a8f2
[formerly 301f3094be
] [formerly 9abb02ea8a
] [formerly 590e37a8f2
[formerly 301f3094be
] [formerly 9abb02ea8a
] [formerly 270d2b0ddb
[formerly 9abb02ea8a
[formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c
[formerly bbe6ec4d50
] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96
]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d
]
Former-commit-id: 803ceadaec
2014-08-04 13:10:13 -04:00
Zhidong.Hao
d175ff24fe
ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
...
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7
Former-commit-id: e085f07dd5
[formerly d7cce22d02
] [formerly 26c4bb2414
] [formerly e085f07dd5
[formerly d7cce22d02
] [formerly 26c4bb2414
] [formerly a3cda853cf
[formerly 26c4bb2414
[formerly 192948e00538bcf0dfc0aaf20ea1dcb216313ffb]]]]
Former-commit-id: a3cda853cf
Former-commit-id: ee0ea4eda5
[formerly ee2f893d21
] [formerly b530a83b93588b9662a433efcc257682d01b21cd [formerly eef5191d1c
]]
Former-commit-id: 0eeed145c6b36d143e71cb6efb8b8fab5b1ff3a9 [formerly 350028e069
]
Former-commit-id: 2a4ea1243c
2014-07-23 14:37:28 -04:00
Richard Peter
0b0b58e89c
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf2372
[formerly 6636b301e5
] [formerly 93bbd98cbc
] [formerly ed38bf2372
[formerly 6636b301e5
] [formerly 93bbd98cbc
] [formerly 8ecc27f714
[formerly 93bbd98cbc
[formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011
[formerly 552ac6d640
] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc
]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6
]
Former-commit-id: 342192e967
2014-07-01 15:34:39 -05:00
Steve Harris
1bbbdc9c62
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 741dc31fcb
[formerly 2f2958df37
] [formerly d4dc1723c1
] [formerly 741dc31fcb
[formerly 2f2958df37
] [formerly d4dc1723c1
] [formerly 7acd9ab2dd
[formerly d4dc1723c1
[formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e
[formerly 7fb4663d75
] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f
]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2
]
Former-commit-id: 8fb747ad27
2014-07-01 11:08:46 -04:00
Zhidong.Hao
e842be1d53
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
...
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 43e1a5a909
[formerly ccbda4db4f
] [formerly 26c6801620
] [formerly 43e1a5a909
[formerly ccbda4db4f
] [formerly 26c6801620
] [formerly 71ab6b9ed0
[formerly 26c6801620
[formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 460b543c6d
[formerly 9094e822e0
] [formerly c17aa2176430d3a612529390ab4b68f86ac03181 [formerly e5c47a51eb
]]
Former-commit-id: 16d700e0af2365b3ff5388b53260c131a361d620 [formerly 3a9abec04b
]
Former-commit-id: 33086a8085
2014-06-03 11:55:32 -04:00
Steve Harris
86d6a0cd4d
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 4469d87a8f
[formerly 718c78d984
] [formerly be80bd01f3
] [formerly 4469d87a8f
[formerly 718c78d984
] [formerly be80bd01f3
] [formerly dc74953978
[formerly be80bd01f3
[formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3
[formerly 0e9d0b2ef5
] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7
]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427
]
Former-commit-id: 5fda99b1fe
2014-05-28 09:01:00 -05:00
Steve Harris
cf2950abdb
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
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.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 08308cd279
[formerly 3de24b7b07
] [formerly 99bc6f990c
] [formerly 08308cd279
[formerly 3de24b7b07
] [formerly 99bc6f990c
] [formerly 3b16bbafb1
[formerly 99bc6f990c
[formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648
[formerly bfa4255eea
] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4
]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369
]
Former-commit-id: 172cca39d9
2014-05-27 14:48:24 -04:00
Brad Gonzales
ad3caf4a8f
Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
...
Amend: updated manifest.
Removed static imports.
Refactored String constants to Pattern constants in TafConstants.
Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
fixed .project. Updated yet more Patterns.
Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc
Former-commit-id: 35afb44d4b
[formerly c4890beb96
] [formerly 6b0e578fc1
] [formerly 35afb44d4b
[formerly c4890beb96
] [formerly 6b0e578fc1
] [formerly e560ce4880
[formerly 6b0e578fc1
[formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]]]
Former-commit-id: e560ce4880
Former-commit-id: 3a75e82e7a
[formerly 6825727400
] [formerly 3e7024f11e766b0b3759f7dfe89c695683e8de9e [formerly e2412ecb43
]]
Former-commit-id: 671ea5c32e2f34163202f6e31c76f0b42201d319 [formerly fea1c9febe
]
Former-commit-id: 26953a7864
2014-05-20 14:13:18 -05:00
Brian.Dyke
0febfec9e7
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 8c0709798d
[formerly f38d0138e6
] [formerly 627541512d
] [formerly 8c0709798d
[formerly f38d0138e6
] [formerly 627541512d
] [formerly d3fa10028c
[formerly 627541512d
[formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b
[formerly b0837b4905
] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e
]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f
]
Former-commit-id: 1d53f6d304
2014-05-14 16:08:16 -04:00
Roger Ferrel
fb8d11aa51
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
...
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: 487b66ffc4
[formerly 6bfacf85ab
] [formerly 039f4826ea
] [formerly 487b66ffc4
[formerly 6bfacf85ab
] [formerly 039f4826ea
] [formerly c226ef3596
[formerly 039f4826ea
[formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]]]
Former-commit-id: c226ef3596
Former-commit-id: 16106fe32a
[formerly 672875baf9
] [formerly 852cdc5cc5ce12eaddae5abc239f333bad66906e [formerly ce1ca8b4e3
]]
Former-commit-id: 39b77f1a25e1d1c090b0b0116907d3b205523575 [formerly 940886ffae
]
Former-commit-id: ea6ef4eb89
2014-05-09 09:34:49 -05:00
Steve Harris
55644af2ca
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 010301045d
[formerly 9e149df799
] [formerly 6ef3b9f1e5
] [formerly 010301045d
[formerly 9e149df799
] [formerly 6ef3b9f1e5
] [formerly 1c8f2f6185
[formerly 6ef3b9f1e5
[formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e
[formerly 927a87b126
] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa
]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870
]
Former-commit-id: 4fe84ba0fd
2014-05-05 08:21:02 -05:00
Richard Peter
a32345d1cb
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb
[formerly 5b14b22ee1
] [formerly 37342cba87
] [formerly ee59a298eb
[formerly 5b14b22ee1
] [formerly 37342cba87
] [formerly 9a7e1aa9b0
[formerly 37342cba87
[formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: d8950196fa
[formerly 2d1262e41f
] [formerly 0442d2b0ea886a8fa3e51c518e72f6a8bad19366 [formerly caccf6ca52
]]
Former-commit-id: 4bd4b3b5852acfa88c28932b1c603be585f53bb9 [formerly b234142252
]
Former-commit-id: dcd2468bee
2014-04-24 19:11:50 -05:00
Brian.Dyke
f2993215f3
Merged 13.5.5 -2 and -3 into 1412
...
Former-commit-id: 81d39113fe
[formerly eff27f5504
] [formerly a19f01c620
] [formerly 81d39113fe
[formerly eff27f5504
] [formerly a19f01c620
] [formerly e82fc8f89c
[formerly a19f01c620
[formerly 4e921dbeab89e61635144b441ae0015155376c59]]]]
Former-commit-id: e82fc8f89c
Former-commit-id: f1ebebbac1
[formerly af2d8f5bad
] [formerly 57b2a8a44845dea3266c201818f90765ddf026ee [formerly df6f06bef5
]]
Former-commit-id: 43839e21018da6e40c7fe75ced0db2714eff9e66 [formerly 0fa669acce
]
Former-commit-id: 378332d8bb
2014-04-24 13:01:50 -04:00
Ron Anderson
997390456d
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
...
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: bf6d35aa0f
[formerly 2f68fb8f2c
] [formerly 221a06e467
] [formerly bf6d35aa0f
[formerly 2f68fb8f2c
] [formerly 221a06e467
] [formerly f3185dd206
[formerly 221a06e467
[formerly e636563052042d2dbfab6a4e476b71004b28c165]]]]
Former-commit-id: f3185dd206
Former-commit-id: 569608769f
[formerly 00f2f374cd
] [formerly 373f6b66bdafbfe9284322be7df3257cc614b264 [formerly 3e37419dc6
]]
Former-commit-id: 8be9012562513da025e5171ffb93c9c520d7ee60 [formerly 78ef1d5c4c
]
Former-commit-id: dd5c3bf2fd
2014-04-23 17:04:16 -05:00
Brad Gonzales
21214319f5
Issue #3001 Changed ccfp-common.xml to used common. Fixed version in com.raytheon.viz.aviation/META-INF/MANIFEST.MF.
...
Change-Id: I118afa785fff93251950f0f10e72979174de35cb
Former-commit-id: 1e1a8e76bd
[formerly ab5481218d
] [formerly 3fb2835dd3
] [formerly 1e1a8e76bd
[formerly ab5481218d
] [formerly 3fb2835dd3
] [formerly 44ada20a68
[formerly 3fb2835dd3
[formerly cd85b148b6b267779d1fe8b510f14f63c45db77a]]]]
Former-commit-id: 44ada20a68
Former-commit-id: 8a7acc9442
[formerly 40e1214776
] [formerly 92ad6759c57e75cfbff18396170bbbfcd7952bdd [formerly dd237ea8ff
]]
Former-commit-id: 5a49ac8a4dba34c0186c5f2841464e0a47c72eb5 [formerly 4303081919
]
Former-commit-id: 7f946c41d1
2014-04-21 10:22:57 -05:00
Mike Duff
b4e489d0e1
Issue #3000 - Split bufrmos plugin into common and edex.
...
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37
Former-commit-id: 8250c23357
[formerly a729b8b8a5
] [formerly b288bd46de
] [formerly 8250c23357
[formerly a729b8b8a5
] [formerly b288bd46de
] [formerly 0be8ad31d1
[formerly b288bd46de
[formerly 3fd04e796b7c409c67c06517265648e576852352]]]]
Former-commit-id: 0be8ad31d1
Former-commit-id: 5efd5741f7
[formerly ad034ab285
] [formerly 08a545b76f857a2a41c798d80966021fe535f72a [formerly 50a65c5a31
]]
Former-commit-id: 03c26a584892cadebd4a033fa839ec012164e1c0 [formerly 1ceb378d0b
]
Former-commit-id: 4bde76c765
2014-04-21 09:50:18 -05:00
Brad Gonzales
7e57799f28
Issue #3001 Renamed com.raytheon.edex.plugin.ccfp to com.raytheon.uf.edex.plugin.ccfp.
...
Amend: Updates from peer review.
Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b
Former-commit-id: 8a6655cb35
[formerly c267d077c3
] [formerly 1a43f04b16
] [formerly 8a6655cb35
[formerly c267d077c3
] [formerly 1a43f04b16
] [formerly 6c7e2ac2a7
[formerly 1a43f04b16
[formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: 4c463adc7e
[formerly b2a95e4f12
] [formerly f7b416cc828835e0d7166283f219d0f260c3e42e [formerly b796120ec9
]]
Former-commit-id: bd7ac9c4128007fd4aa7a72e720880171ea0abd3 [formerly 2a7aae659c
]
Former-commit-id: e0245983cf
2014-04-18 15:16:41 -05:00
Brad Gonzales
062e2fa017
Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and
...
CcfpRecord to that project. Updated feature and manifest references.
Amend: Updates from peer review.
Change-Id: I5606bbf3ba1dc3d5ad7bdcf3341c57436f9485b3
Former-commit-id: 09accb6fc3
[formerly fd0bb35109
] [formerly ab2488b2db
] [formerly 09accb6fc3
[formerly fd0bb35109
] [formerly ab2488b2db
] [formerly 975a088945
[formerly ab2488b2db
[formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]]
Former-commit-id: 975a088945
Former-commit-id: d6ecf7a63e
[formerly 4ad01be9e1
] [formerly 7aa4e12f54f97b61e748a6950c8f532ae66df86b [formerly 72b4b07fb4
]]
Former-commit-id: b349a8b7b2c176b8c81674fd46397ac4634bb4c9 [formerly e06b46c765
]
Former-commit-id: 3081ab6276
2014-04-16 17:07:49 -05:00
Richard Peter
626ab0bd58
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 3575d6586f
] [formerly 9b12d9ddaf
[formerly cd51f3fa87
] [formerly 3575d6586f
] [formerly 21ae3b5fcd
[formerly 3575d6586f
[formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2
[formerly d65b11d404
] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66
]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54
]
Former-commit-id: a22345ea6b
2014-04-11 16:23:09 -05:00
Everett Kladstrup
f815fbcb60
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly 0699041518
[formerly 06d6961c0f
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9
[formerly 86bf2b5ea0
] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc
]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a
]
Former-commit-id: 7b2683532a
2014-04-09 09:31:12 -05:00
David Friedman
8ea6e0b064
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 ee37afaf7b
[formerly 32a7adbe4b
] [formerly fd900e38c2
] [formerly f146c7bcd0
[formerly fd900e38c2
[formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99
[formerly 1168a3eae5
] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863
]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3
]
Former-commit-id: 8f8f55dd3c
2014-03-27 19:17:03 +00:00
Lee Venable
d08f39f428
Issue #2925 - Fixed NPE found during testing.
...
Former-commit-id: a700d23f6d
[formerly cc7d240cfd
] [formerly c29981fa99
] [formerly a700d23f6d
[formerly cc7d240cfd
] [formerly c29981fa99
] [formerly 5b73c516d3
[formerly c29981fa99
[formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 1fb169f1ce
[formerly 05a4c4e31b
] [formerly 0052d9d30c35dc39dd69aece42fc59a0f471c58f [formerly f08d4a827f
]]
Former-commit-id: 275c2d56eebfcd30f92e3347955172f87a580714 [formerly 2384cc90c0
]
Former-commit-id: f160e66a85
2014-03-21 12:42:13 -05:00
Lee Venable
89b17a4b1d
Issue #2925 - added runAsync dispose checks.
...
Change-Id: I4048f4b4ae8976d93b1bee89179be527ee3139e5
Former-commit-id: b1d2e221fd
[formerly 43cfdc587a
] [formerly 112f7a886e
] [formerly b1d2e221fd
[formerly 43cfdc587a
] [formerly 112f7a886e
] [formerly 397cb233d4
[formerly 112f7a886e
[formerly 2ebffdcfca606309daa3ed587f696a95af0b094e]]]]
Former-commit-id: 397cb233d4
Former-commit-id: 726643d800
[formerly 30f7cac193
] [formerly 8bf9e4370bd960a8ee23f520ef69911e15a0ba3f [formerly 2a6f9e8a85
]]
Former-commit-id: 307d52f276ccba912990a9b4825775b2e246f16e [formerly 60f93fef09
]
Former-commit-id: bf055bee25
2014-03-20 13:09:17 -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: 865fef97b1
[formerly 51b755a476
] [formerly 873bd6b889
] [formerly 865fef97b1
[formerly 51b755a476
] [formerly 873bd6b889
] [formerly f60aba35d6
[formerly 873bd6b889
[formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae
[formerly c24108e75b
] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e
]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433
]
Former-commit-id: ed7921643c
2014-03-07 15:43:40 -06:00
Steve Harris
3348f6857a
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: da2d7fc334
[formerly 068297b90a
] [formerly 92232fa063
] [formerly da2d7fc334
[formerly 068297b90a
] [formerly 92232fa063
] [formerly 40b543f9a8
[formerly 92232fa063
[formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324
[formerly 4d1fbf8743
] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046
]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320
]
Former-commit-id: e29b96b6bd
2014-03-07 15:16:18 -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: 52226061e9
[formerly 3ba28aabea
] [formerly 069093884f
] [formerly 52226061e9
[formerly 3ba28aabea
] [formerly 069093884f
] [formerly ffcc34f8d4
[formerly 069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b
[formerly 587f15a95d
] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0
]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19
]
Former-commit-id: 2db5dcf6eb
2014-03-06 08:39:43 -06:00
Max Schenkelberg
7c66cf792b
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: dbc6cc3fc6
[formerly 59434c8a60
] [formerly a01a6d68d0
] [formerly dbc6cc3fc6
[formerly 59434c8a60
] [formerly a01a6d68d0
] [formerly cbf8b9249c
[formerly a01a6d68d0
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26
[formerly 39e1c4fa46
] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2
]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134
]
Former-commit-id: c6cf08db73
2014-03-04 09:23:36 -06:00
Brian.Dyke
7316b34ef5
OB_14.1.1-20 baseline
...
Former-commit-id: 2613e13e08
[formerly b2401d2f0d
] [formerly 324696c436
] [formerly 2613e13e08
[formerly b2401d2f0d
] [formerly 324696c436
] [formerly 2bad40cfee
[formerly 324696c436
[formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]]
Former-commit-id: 2bad40cfee
Former-commit-id: 89b66fcb5b
[formerly c873f20d04
] [formerly ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3
]]
Former-commit-id: 9b0f4d8a2c398c18300fab2c3d13cb0bf783a1ef [formerly 5feadbe4d9
]
Former-commit-id: f9587d39d1
2014-02-26 17:39:15 -05:00
Nate Jensen
012037c1e6
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: a201d43d63
[formerly 230b8bf117
] [formerly 8a00a419a1
] [formerly a201d43d63
[formerly 230b8bf117
] [formerly 8a00a419a1
] [formerly f353c44cc0
[formerly 8a00a419a1
[formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]]
Former-commit-id: f353c44cc0
Former-commit-id: 4d460d3a26
[formerly a97f5b5ff7
] [formerly 67f46ed66aeefd71f35b8ac193010ae9e960ed0b [formerly 74329bcb89
]]
Former-commit-id: 31bbfe66d1d6c2a45d0680feb24acf664d2ade63 [formerly 02d2f0c713
]
Former-commit-id: 78c8f1a62c
2014-02-24 15:35:13 -06:00
Brian.Dyke
de9e6553a9
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 10b723647b
[formerly cfa4997978
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb
[formerly c41dd22ff2
] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5
]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564
]
Former-commit-id: f86f9f8918
2014-02-21 06:50:59 -05:00
brian.dyke
4744c64069
merge 14.2.1-3 into asm-14.2.2
...
Former-commit-id: becf6322c6
[formerly 4a62e83835
] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57
]] [formerly becf6322c6
[formerly 4a62e83835
] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 2294c81a57
]] [formerly f10f6d4e8a
[formerly 2294c81a57
[formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: ac37e2ea2e
[formerly 621464ac0d
] [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0
]]
Former-commit-id: ee40d762efff70a1679bc3c2641d377b51facc3b [formerly dcf5f25ed1
]
Former-commit-id: ca9263003a
2014-01-27 15:27:49 -05:00
Zhidong.Hao
a689a63ec4
Issue #112
...
Change-Id: I674975b805661ad191c5b4af3ad7132371e1a479
Former-commit-id: 19ed94a647
[formerly b86b5fc0ee
] [formerly d61fe61466
] [formerly 19ed94a647
[formerly b86b5fc0ee
] [formerly d61fe61466
] [formerly 57e78b6a11
[formerly d61fe61466
[formerly b937a25ac189024718ee7832386d20f79e1d63e0]]]]
Former-commit-id: 57e78b6a11
Former-commit-id: f0b4fce274
[formerly 4be6cef7c8
] [formerly bce8ce2fe920c4189ba4e4f20ad73f653d00962b [formerly 54bab6905a
]]
Former-commit-id: b9ac139ab43bdbe34800aaadb9db8dd6012181e4 [formerly 726bf51abb
]
Former-commit-id: 96e613693f
2014-01-15 11:16:26 -05:00
Zhidong.Hao
a699abba80
Issue #100
...
Change-Id: I31c56395a69d8b1a140e652b434149dd98207e81
Former-commit-id: 9c1196d427
[formerly 6cb6519232
] [formerly 7009311c86
] [formerly 9c1196d427
[formerly 6cb6519232
] [formerly 7009311c86
] [formerly a5280b938c
[formerly 7009311c86
[formerly f58eb9a800491de5850fa82a6e37b029f41ceb1c]]]]
Former-commit-id: a5280b938c
Former-commit-id: eefb42c343
[formerly 96e371fd9e
] [formerly 4cd237bf69117f0b4a2788ff2fcbbf36d67a10e1 [formerly 018536c97f
]]
Former-commit-id: 0e77f15437e4b8ab46865878c98cb3c885a3c3b3 [formerly ea6590b419
]
Former-commit-id: da6eb8bd38
2014-01-13 14:11:44 -05: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
Steve Harris
31c94115c7
14.1.1-12 baseline
...
Former-commit-id: f53eb87892
[formerly 371d1ca63c
] [formerly b24d9c80b0
] [formerly f53eb87892
[formerly 371d1ca63c
] [formerly b24d9c80b0
] [formerly a3ec45a99f
[formerly b24d9c80b0
[formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b
[formerly 4e6f319422
] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af
]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed
]
Former-commit-id: 60f062ea59
2013-12-04 16:47:59 -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
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
Steve Harris
24ec3c5993
14.1.1-6 baseline
...
Former-commit-id: f44bae4383
[formerly 946a9be17e
] [formerly 0cb2978c13
] [formerly f44bae4383
[formerly 946a9be17e
] [formerly 0cb2978c13
] [formerly 6067af4252
[formerly 0cb2978c13
[formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6
[formerly e86a0aa489
] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793
]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d
]
Former-commit-id: 0aa90a7855
2013-11-06 14:08:33 -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
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
Steve Harris
719dfc4763
13.5.3-1 baseline
...
Former-commit-id: 9577afee9e
[formerly 059083170d
] [formerly 1d8a2026f6
] [formerly 9577afee9e
[formerly 059083170d
] [formerly 1d8a2026f6
] [formerly 30f65c2858
[formerly 1d8a2026f6
[formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837
[formerly 06f5dcf801
] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0
]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c
]
Former-commit-id: 0e99e713e6
2013-10-28 10:30:57 -04:00
Steve Harris
3a21a9eb6c
13.5.2-4 baseline
...
Former-commit-id: 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 58c6821427
[formerly e3c935d48b
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82
[formerly 4c6790f10f
] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59
]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5
]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00