Commit graph

322 commits

Author SHA1 Message Date
Richard Peter
0f0eb6d584 Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: 731f55d574 [formerly 242716fb0f] [formerly d5ec01f7c0] [formerly 731f55d574 [formerly 242716fb0f] [formerly d5ec01f7c0] [formerly adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]]
Former-commit-id: adff7b5684
Former-commit-id: e3e1298591 [formerly 741710881f] [formerly a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b]]
Former-commit-id: 065948ec980c395d5dc6d7a3764fa1461ccb4d8e [formerly 401a880686]
Former-commit-id: 28d5614351
2014-05-08 09:06:31 -05:00
Richard Peter
c85f22eb55 Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]]
Former-commit-id: 611c010968
Former-commit-id: 8e8e1c45ed [formerly be288505e0] [formerly f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801]]
Former-commit-id: 91832432fed4e1ab82df2940b746247f362e5e2d [formerly a03997122b]
Former-commit-id: fc1f958e5b
2014-05-06 15:54:23 -05:00
Dave Hladky
766d9f09a7 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
2014-05-05 12:15:14 -05:00
Brian.Dyke
f4856aae4d Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
2014-04-30 12:57:09 -04:00
Richard Peter
e748b7c1e5 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 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
Richard Peter
cfd219f2bb Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 6918dc0026 [formerly 36742a30f3 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]]
Former-commit-id: 6918dc0026
Former-commit-id: 4e1a30b4d9 [formerly 433d5a77f6] [formerly e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a [formerly 52e821b5bb]]
Former-commit-id: 983a1eeebf0004a7badd7ac01293b0008554a0e2 [formerly 5a49b7e345]
Former-commit-id: 6775b0dce6
2014-04-25 14:53:22 -05:00
David Gillingham
b68680eb65 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 2426e463f7 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 8db5524b3f [formerly 48bc49fd4b] [formerly cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86]]
Former-commit-id: c46af48dc3a4136893d9194d27b43b98838b448d [formerly c0fd32360d]
Former-commit-id: 83674f8444
2014-04-25 10:56:43 -05:00
Brian.Dyke
19b4bb7dcc 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 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Brian.Dyke
2d59b52ed1 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ba9db6701e [formerly a5c9321a8d] [formerly a61af3e6d3] [formerly ba9db6701e [formerly a5c9321a8d] [formerly a61af3e6d3] [formerly ac74878ae2 [formerly a61af3e6d3 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]]
Former-commit-id: ac74878ae2
Former-commit-id: 4c6965a7b7 [formerly ae4aea9abf] [formerly 5d8cf396e99529f083d1d1c43f5d3d81d3281d10 [formerly c21644c87f]]
Former-commit-id: 5524fa83a931031b720fb2e7782ca93e2b562dc8 [formerly b3a733036c]
Former-commit-id: d6e931dd87
2014-04-24 13:28:31 -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
Ron Anderson
860054697f Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052

Former-commit-id: 6d77ebe181 [formerly db978fff9a] [formerly b12a6cd828] [formerly 6d77ebe181 [formerly db978fff9a] [formerly b12a6cd828] [formerly 859d709a03 [formerly b12a6cd828 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]]]
Former-commit-id: 859d709a03
Former-commit-id: a6c8d0ceb2 [formerly 57e277dc69] [formerly ffdd8311439ceb4450211a9ab4304f0740a99b18 [formerly e8a07a2ebe]]
Former-commit-id: 9462575e90ac1b1dd9fd8b65be06f381662f260a [formerly 51bb78561c]
Former-commit-id: 0c7c52095e
2014-04-22 14:38:54 -05:00
Zhidong.Hao
593de6544a ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303

Former-commit-id: f32bb4e4f4 [formerly f16936223a] [formerly e1d5aa284d] [formerly f32bb4e4f4 [formerly f16936223a] [formerly e1d5aa284d] [formerly 0177756f97 [formerly e1d5aa284d [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]]]
Former-commit-id: 0177756f97
Former-commit-id: 5d43f374e6 [formerly d6edd56d34] [formerly 9f33fbaadba8e0a9341c8ae8af0ac30d2dc2b193 [formerly 358e7b2b54]]
Former-commit-id: d70b4f5ba087dbb9db3d7fe268b68edcd8be7c2f [formerly 7d00166b10]
Former-commit-id: 914803ff7a
2014-04-22 14:31:14 -04:00
brian.dyke
16be9500b9 Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]]
Former-commit-id: a6708cc174
Former-commit-id: 627004af0a [formerly e8dffad9cb] [formerly c50a848c670c4b4d84b5ed17c503151cf6c6b7f1 [formerly 5b27f2987f]]
Former-commit-id: 4e673bda45fe4b6268410b72231d4d0d2ad7d4bb [formerly d148fbe645]
Former-commit-id: 6a5c7d7684
2014-04-14 15:29:23 -04:00
Richard Peter
5350b3eac8 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 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
2014-04-14 13:10:11 -05:00
Zhidong.Hao
0f1a1e52a7 ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1

Former-commit-id: a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]]]
Former-commit-id: 9c18f60924
Former-commit-id: a8eaf88994 [formerly 3adcd5bca5] [formerly 0eb35c20c9f879386db51a895123b7b5435e2d64 [formerly 13808687c1]]
Former-commit-id: a1c719e81d4d018bd8ddb252c1e0303980194856 [formerly 7996e95745]
Former-commit-id: 2b0fd93679
2014-04-11 15:51:12 -04:00
Zhidong.Hao
ac40440ce5 ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c

Former-commit-id: 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]]
Former-commit-id: 1a91b820d9
Former-commit-id: 531eea30e1 [formerly ab0c9a65d2] [formerly 3276287380788647756570a048989a84fecfcd89 [formerly c6d9a3926e]]
Former-commit-id: 2be119384e43516b510a208409a4f3c49e88e8d7 [formerly a94bf1a110]
Former-commit-id: a846d4c4f5
2014-04-11 15:34:06 -04:00
Brian.Dyke
f77319aa5b Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
2014-04-10 13:26:42 -04:00
David Gillingham
cb52793865 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]]
Former-commit-id: da31ab2042
Former-commit-id: 969dccd366 [formerly 0385a4395e] [formerly cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94]]
Former-commit-id: fc3f96a9df8963b4b0cfcf9e1a139bf208111b7b [formerly 89046665f6]
Former-commit-id: 2ab21ac335
2014-04-10 11:24:40 -05:00
Richard Peter
52a54f5e9f 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 efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
2014-04-09 16:00:54 -05:00
Ron Anderson
871f619b99 Issue #2694 Converted GetBrokerConnections to Java.
Change-Id: Ic9445906ed88036d6598ffec0319de9c89f8c163

Former-commit-id: 7c9f4091c2 [formerly d16380e50e] [formerly a6794beaa5] [formerly 7c9f4091c2 [formerly d16380e50e] [formerly a6794beaa5] [formerly df9c5c81d6 [formerly a6794beaa5 [formerly 102c81e1aafdcfa171440df1cba97d27b2ba3c2a]]]]
Former-commit-id: df9c5c81d6
Former-commit-id: 454323fd74 [formerly d1cb494222] [formerly 7524b26cc572e199e0f694889a08af77618fbbde [formerly d778e9dac6]]
Former-commit-id: 5c9146609d77cf7f728cb45e3c2fdc22d4df085c [formerly 8bb878a61d]
Former-commit-id: 840c8131b6
2014-04-07 15:18:01 -05:00
Brian.Dyke
ae3f5dbff6 Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
2014-04-04 12:57:32 -04:00
Ron Anderson
725dfcaa99 Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe

Former-commit-id: 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly ea250a253f [formerly 01ab6ce52d [formerly 5db8738783d79e8a48bfffac49910cc46df61ad2]]]]
Former-commit-id: ea250a253f
Former-commit-id: 1c032ab6f0 [formerly 4d9d2f59aa] [formerly 11feb3f28beaaea54d7cf1c0af9fce201f9ec319 [formerly de50c5e47d]]
Former-commit-id: 5dcab0023593976bafa739a23acb671a15943281 [formerly 9e568e1749]
Former-commit-id: 1e9e4479c8
2014-04-03 16:56:36 -05:00
David Gillingham
be6e42d91b Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 13017ce731 [formerly 64981356c8] [formerly a8749ff88e3ad01c4b1fec62d193a19acac4a3ef [formerly 22266d36b9]]
Former-commit-id: b2a35016bf9e27eefdf55483242773ab74367055 [formerly 3ad0872bda]
Former-commit-id: 14f927fe54
2014-03-31 15:49:33 -05:00
Ben Steffensmeier
1aa51a118b Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 26558fad1e [formerly aadc22091e] [formerly 17445664d752b4ffa0186bdce951baaffefd1f21 [formerly ab8293c6a1]]
Former-commit-id: b8e1bca2fe93a3c4fa125052086c7d64a243b406 [formerly d20a1a6f54]
Former-commit-id: 77d809f66a
2014-03-24 11:10:18 -05:00
Ron Anderson
9accd00e1f Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: cbd408ce4e [formerly 06b0b5b684] [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]]
Former-commit-id: cfe7b7159bee965bab52438c7b1f622e5351016b [formerly 4ffc16ce53]
Former-commit-id: 98e22f6e59
2014-03-13 11:11:53 -05:00
Steve Harris
9c0f484340 Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 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
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
Richard Peter
ef2ff1d0f7 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Brian.Dyke
9db7ca881a Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
2014-02-24 14:51:00 -05:00
Ron Anderson
5eb76e8ed6 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
2014-02-24 13:46:48 -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
Ron Anderson
13cf523fb0 Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 6645688ff4 [formerly 2bfa521e7d] [formerly 6b6aa14e59] [formerly 6645688ff4 [formerly 2bfa521e7d] [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 6b6aa14e59 [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]]
Former-commit-id: 08a1be844d
Former-commit-id: e1a346790e [formerly 0ee3625c50] [formerly ccd2b797cfa81d3394ddffbff2fae12e18e85480 [formerly 1571b9a8eb]]
Former-commit-id: b143a17afee4d4020a754d4a6c26cfa8398ff32d [formerly 7897be61e2]
Former-commit-id: 30d9fec3ae
2014-02-20 09:34:18 -06:00
Ron Anderson
c3b687b9a5 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
2014-02-18 10:45:20 -06:00
Steve Harris
a5d78a7f44 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
2014-02-17 08:54:34 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
2014-02-13 10:10:34 -06:00
Ron Anderson
3d1cd70b57 Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]]
Former-commit-id: ee89463d27
Former-commit-id: 07fdb410c6 [formerly 1ca9c95567] [formerly 92ba98108868529a68af7962661c0c08a1eade14 [formerly bfa65ed39e]]
Former-commit-id: 738332a4bfc2ad7f86c63c6827a2be4e66627c41 [formerly dd597e8349]
Former-commit-id: 454ce0268d
2014-02-11 17:07:01 -06:00
Brian.Dyke
fc21d2dee4 14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
2014-02-11 15:52:50 -05:00
Brian.Dyke
97bf17521e Issue #88
Former-commit-id: 6510e6da5a [formerly d56bdce6ff] [formerly 643ef1a1a6] [formerly 6510e6da5a [formerly d56bdce6ff] [formerly 643ef1a1a6] [formerly edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]]
Former-commit-id: edccef5569
Former-commit-id: 9cf763cd13 [formerly cdb408daf8] [formerly 99d3c8608feda52225fe2dd85b896e03bfe99a30 [formerly a5606c86c7]]
Former-commit-id: 4ab0b8424f27ebdbb06be07987bd8f71c6cdee8a [formerly 83ebe8826f]
Former-commit-id: 904ffbd83e
2014-02-04 16:34:40 -05:00
Brian.Dyke
e0236cc20a 14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361]
Former-commit-id: b8f7317b9d
2014-02-04 12:33:46 -05:00
Ron Anderson
a967ebbe67 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: c717b6d805 [formerly 81f9709ae7] [formerly fb262fdad2] [formerly c717b6d805 [formerly 81f9709ae7] [formerly fb262fdad2] [formerly 7c06f0b011 [formerly fb262fdad2 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 70e1a066d4 [formerly 25123bdeb0] [formerly a3818c2ef69b516c0e2514d6b82f2afc46368905 [formerly 64f55c6b02]]
Former-commit-id: e95cf485b4181e0315e0ab7317375623e930e02c [formerly d2d7920575]
Former-commit-id: 7e541f2f77
2014-01-29 14:16:31 -06:00
Ron Anderson
6c7d4c2b4a Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: 9215ca8f82 [formerly ea12cecc04] [formerly ce28c6c47f] [formerly 9215ca8f82 [formerly ea12cecc04] [formerly ce28c6c47f] [formerly 0f6e082769 [formerly ce28c6c47f [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]]]
Former-commit-id: 0f6e082769
Former-commit-id: ba249df313 [formerly 09335f5372] [formerly ee24887886668d70e0e574bfe841a1f6d4aa3cec [formerly 5427d15150]]
Former-commit-id: 3e899872dc8686e49208b77ba9de94a800567a7c [formerly 280434a03f]
Former-commit-id: 2086f03c28
2014-01-29 13:55:54 -06:00
David Gillingham
ea868da200 Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: 304eaa9f29 [formerly fc25bbe1e9] [formerly 5edfbaa4a5] [formerly 304eaa9f29 [formerly fc25bbe1e9] [formerly 5edfbaa4a5] [formerly c802315ddc [formerly 5edfbaa4a5 [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]]]
Former-commit-id: c802315ddc
Former-commit-id: 009e8c553d [formerly 04d6bc5a42] [formerly 6efd1e8e262f0905b42ba0a2df62a1b5c000be88 [formerly 17d38b4974]]
Former-commit-id: e9128c3f59d7240b2b0d840be6a80f40df8effd2 [formerly 38333b45a7]
Former-commit-id: 14326b8c8d
2014-01-29 11:56:05 -06:00
Ron Anderson
c131201be8 Issue #2504 Change other GFESuite scripts to use iscUtil.getLogger for consistency
Change-Id: I4ce123e8030075bf4a247152dd053ba16dad6987

Former-commit-id: 567c7b0fe5 [formerly c353c4aa74] [formerly c133dc5506] [formerly 567c7b0fe5 [formerly c353c4aa74] [formerly c133dc5506] [formerly a54c44a6fb [formerly c133dc5506 [formerly b0357df1c4b82623f1345362ddd6ca57d514a1e6]]]]
Former-commit-id: a54c44a6fb
Former-commit-id: f445c7eb7b [formerly 380f161220] [formerly 784492436cc2531dac82b914b739ebae83ee86f2 [formerly a330f388b0]]
Former-commit-id: 72da3459151480b123dd0fa53eba75d776f89209 [formerly a722dba9a0]
Former-commit-id: 694ff599dd
2014-01-24 17:01:40 -06:00
Ron Anderson
20a4e5929b Issue #2504 Add hostname to log path for GFESuite scripts
Change-Id: I734d8f6ec89720d23371bd9c1187ef95eeaf22eb

Former-commit-id: f9e56a01aa [formerly 2c3cad8a81] [formerly 25cf05060d] [formerly f9e56a01aa [formerly 2c3cad8a81] [formerly 25cf05060d] [formerly e13a34a8b3 [formerly 25cf05060d [formerly 975cf49b49e6266081e7b9ebcce6782b3e411667]]]]
Former-commit-id: e13a34a8b3
Former-commit-id: 6782b20868 [formerly bfd5c96cd9] [formerly 8be0103561de6922e68ce83a93df118bbf55e71b [formerly ca80941c5b]]
Former-commit-id: 8ed7513637d19080fe931d45fb47a8989653e4ee [formerly d819cc2512]
Former-commit-id: da1b299e40
2014-01-24 09:04:11 -06:00
Ron Anderson
14ad1410e4 Issue #2720 Improve efficiency of merging polygons in edit area generation
Change-Id: I8fd83384431942fd71f30aba6053ee12af7d0eb4

Former-commit-id: 70c0e383d7 [formerly bd3778fdd4] [formerly 8fde77b529] [formerly 70c0e383d7 [formerly bd3778fdd4] [formerly 8fde77b529] [formerly 9805de99fa [formerly 8fde77b529 [formerly c1ab9bc049528eb33b311355f6b089e67ea4997d]]]]
Former-commit-id: 9805de99fa
Former-commit-id: e5a7836741 [formerly 2c6abd4ff0] [formerly cb51a674bc89a25be22f221003c36d747aa8391f [formerly 7649381c8c]]
Former-commit-id: 3371b469f52cc30056c817e52c750aff859ecc92 [formerly 0873c4ce9a]
Former-commit-id: a6ec9db185
2014-01-21 13:25:31 -06:00
David Gillingham
da41766e87 Issue #2418: Fix PHISH parameter name case issues discovered in test.
Former-commit-id: 23878cd0d0 [formerly 1179080434] [formerly c0065ec2a9] [formerly 23878cd0d0 [formerly 1179080434] [formerly c0065ec2a9] [formerly 5401124a1f [formerly c0065ec2a9 [formerly a33e5eb63fe0ad7b9d79e878a9877500065a05a8]]]]
Former-commit-id: 5401124a1f
Former-commit-id: dc658ff27d [formerly f2bc6abb80] [formerly 43eb7ae8cb9a0b320f8e37fc7b98908c6475de3d [formerly cc9f2dcd27]]
Former-commit-id: b58824382e4ec03062c7f5384a47b6d622c3d8e8 [formerly ce0d4cef69]
Former-commit-id: c1fcd5f3af
2014-01-20 15:37:52 -06:00
Steve Harris
f8496662a0 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb]
Former-commit-id: ccd2f6cdaa
2014-01-20 10:17:44 -06:00
gerritcm
e924818487 14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]]
Former-commit-id: b84f7d4203
Former-commit-id: c1df3eb55c [formerly b72cd19055] [formerly 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]]
Former-commit-id: d2214c65a6550cba23bc7837777ef6a2fc6d443a [formerly 5f79da2501]
Former-commit-id: 6bf3189db9
2014-01-16 16:43:05 -05:00
Ron Anderson
17fd0b0fcd Issue #2660 Improved error logging in GetBrokerConnections.py
Change-Id: Icf39a847106c13785e16aaef12283f44f4791cd1

Former-commit-id: 76c4f81485 [formerly 8531b21576] [formerly f47313690a] [formerly 76c4f81485 [formerly 8531b21576] [formerly f47313690a] [formerly 2db1ae7b2d [formerly f47313690a [formerly b078a4fa3dc8df69903fa07e172b5de6313bb17a]]]]
Former-commit-id: 2db1ae7b2d
Former-commit-id: 8de16b0553 [formerly b7ca6eca30] [formerly 9299a09360a65becc4e20cd2ee0487943e8737a8 [formerly 7ae517c5d2]]
Former-commit-id: 73efd9453991f262b3c43753649034075fea6bd8 [formerly 4939e09c4a]
Former-commit-id: eff389d23d
2014-01-16 09:04:15 -06:00
Ron Anderson
d5324b195f Issue #1571 Fix bug in GFE where DbId in ParmId did not match the Database.
Change-Id: I08b5ec1dbbf95d269c9f1ad7fb5e02a8a471b7ec

Former-commit-id: fe81181bf1 [formerly a656439fb2] [formerly 46f00786ed] [formerly fe81181bf1 [formerly a656439fb2] [formerly 46f00786ed] [formerly fae5283358 [formerly 46f00786ed [formerly c03aacd100a73d84d96bfcd3db447597f478fcb7]]]]
Former-commit-id: fae5283358
Former-commit-id: c2c4142235 [formerly 4f4f4996be] [formerly cc91b608d397b8f1c96faf04a7964719df9bec04 [formerly 151cb21153]]
Former-commit-id: 3f000ca5732dfdf9905d3245bfea3385136cb592 [formerly 57fd63be92]
Former-commit-id: bbe66d7472
2014-01-15 16:16:44 -06:00