Commit graph

2904 commits

Author SHA1 Message Date
Mike Duff
4fb549e9f2 Issue #2064 - Add ability to subscribe to observational point data (MADIS)
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa

Former-commit-id: e6f8712306 [formerly 77611d7e9c] [formerly 321209adb8] [formerly e6f8712306 [formerly 77611d7e9c] [formerly 321209adb8] [formerly 12e5155edc [formerly 321209adb8 [formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]]]
Former-commit-id: 12e5155edc
Former-commit-id: d9c8fa4f5c [formerly 41f817e755] [formerly ab2941e89c2d1b9a72ce27a9b74bec7f87fc7a12 [formerly 5e7ec92696]]
Former-commit-id: 3a4d38d0abfb2f40ce6aee4d0848c7c48a98cd78 [formerly 98d413f51b]
Former-commit-id: be7b0be127
2013-06-05 12:06:58 -05:00
Lee Venable
ebe31cd9fc Merge "Issue #1984 - Save images for table columns so they don't throw errors in Windows." into development
Former-commit-id: dfb9c5ecae [formerly 3c2ba8d3ec] [formerly 778baf331f] [formerly dfb9c5ecae [formerly 3c2ba8d3ec] [formerly 778baf331f] [formerly 6d0d8a3a8e [formerly 778baf331f [formerly a2fc3646e554018740153c78f2ecd3bc88abb691]]]]
Former-commit-id: 6d0d8a3a8e
Former-commit-id: 6f09a11696 [formerly 04788b06d9] [formerly b632204fcaa273d2105013dc1fb13aec46e1cc3d [formerly a0cd3823a3]]
Former-commit-id: e47dc5508ddaf6a5e2523a2525e7fd93287fe9c7 [formerly 48a57ac567]
Former-commit-id: d4d3655726
2013-06-05 08:45:39 -05:00
Nate Jensen
4d48f3c558 Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
Former-commit-id: fb7e8c6070 [formerly 38b028b665] [formerly 725adab244] [formerly fb7e8c6070 [formerly 38b028b665] [formerly 725adab244] [formerly 4bfba7d6c6 [formerly 725adab244 [formerly 3d70e1866b618991ed0f8decb4925c794222c7ad]]]]
Former-commit-id: 4bfba7d6c6
Former-commit-id: c5ed0f981a [formerly 64ccc2c283] [formerly 6fc65338458aaa9265fae7cd81c3267e87afe0a1 [formerly 07b1854308]]
Former-commit-id: 7aebf2a60d28e6489a09c4231c774644ee1cb25c [formerly 27a4a99771]
Former-commit-id: e61ae7a5e1
2013-06-05 08:42:23 -05:00
Ben Steffensmeier
6090cbdde6 Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
Former-commit-id: 2370b4305c [formerly a01c4eb02b] [formerly 2dc2e990cb] [formerly 2370b4305c [formerly a01c4eb02b] [formerly 2dc2e990cb] [formerly 19af45e525 [formerly 2dc2e990cb [formerly 327fe058b08967d18fa83ac9e6fc9c3356d68ff2]]]]
Former-commit-id: 19af45e525
Former-commit-id: 05874a2376 [formerly 016ed7211f] [formerly 7f1e69827c61f66c1292d7cb055f2116de1b2d8f [formerly d773bbf625]]
Former-commit-id: f0ba032b8faf66ab230082c83fd4d7e54fee0fd8 [formerly d9b9d4ed7c]
Former-commit-id: 6e18c7a6a8
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
e277655937 Issue #2041 Improve exception handling for concurrent python.
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47

Former-commit-id: d9599eb3ae [formerly 5d5cd5e5f4] [formerly 8ce74c44df] [formerly d9599eb3ae [formerly 5d5cd5e5f4] [formerly 8ce74c44df] [formerly ef10b56e2b [formerly 8ce74c44df [formerly c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea]]]]
Former-commit-id: ef10b56e2b
Former-commit-id: 4a98cb43a4 [formerly f78e0f18bf] [formerly 137f40ebc8428c8099afb92fc2a47d584a2c089d [formerly 0f70964bc9]]
Former-commit-id: 990432480823f66e862fc9a1dbba21d24cad808a [formerly 6109fde71d]
Former-commit-id: 580302942a
2013-06-04 17:03:05 -05:00
Lee Venable
796e23691d Issue #1984 - Save images for table columns so they don't throw errors in Windows.
Change-Id: I42bb4549664296abde66d5904b0ce1739ba6232c

Former-commit-id: 7c05dc6cc0 [formerly 86ff9a13a8] [formerly 187a4e9b17] [formerly 7c05dc6cc0 [formerly 86ff9a13a8] [formerly 187a4e9b17] [formerly 377c675436 [formerly 187a4e9b17 [formerly 3f26818dfeb006393598af41faf33cac6957d3e0]]]]
Former-commit-id: 377c675436
Former-commit-id: cd2bc6cb06 [formerly e809c6dfaf] [formerly 9b49b8b60af6b50b592dd8eaab2513a03b5bf29f [formerly d6274ac813]]
Former-commit-id: ddbd715ecebc75a1473cea49555b488a377736d0 [formerly 3759a4a914]
Former-commit-id: 253da4cf92
2013-06-04 15:48:40 -05:00
Greg Armendariz
4b1ffddf1c Merge "Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files" into development
Former-commit-id: 7409c24e4b [formerly 38e765397a] [formerly 2bb9f1ceec] [formerly 7409c24e4b [formerly 38e765397a] [formerly 2bb9f1ceec] [formerly 5b29c71d38 [formerly 2bb9f1ceec [formerly b88ac881c4963543a21566ae1361638ec40f8ac0]]]]
Former-commit-id: 5b29c71d38
Former-commit-id: 7b79540a57 [formerly 38c7865a12] [formerly 800a303d66f1897b74d520d00a685c51db55ad67 [formerly 9af992ed12]]
Former-commit-id: 7dbe62e2fccdb69266a813aa340982db4ccd9c3b [formerly 61594d9524]
Former-commit-id: 7b8c0cd36c
2013-06-04 15:29:10 -05:00
Richard Peter
1a31effed0 Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
Former-commit-id: 96c8232006 [formerly 2281df8c5b] [formerly e513fdbc3e] [formerly 96c8232006 [formerly 2281df8c5b] [formerly e513fdbc3e] [formerly 220e817e15 [formerly e513fdbc3e [formerly 1b5ab5d85b4f634357d0f52551b800378349b363]]]]
Former-commit-id: 220e817e15
Former-commit-id: cbfbab7fb9 [formerly b5cccf449d] [formerly b87e95d2898e502766c05274499e1d042203b0c2 [formerly 6b75cad25f]]
Former-commit-id: f6fef22aee2325e1325aec4030039a6776b9a2aa [formerly c3bc837e61]
Former-commit-id: 1aa877a259
2013-06-04 15:08:09 -05:00
Richard Peter
31586d6e52 Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
Former-commit-id: 4abe0f2e59 [formerly 03b2db312e] [formerly 82341a9fc1] [formerly 4abe0f2e59 [formerly 03b2db312e] [formerly 82341a9fc1] [formerly 3be654e028 [formerly 82341a9fc1 [formerly aa178f96c90b1c13ade6eb7db297583e5241601c]]]]
Former-commit-id: 3be654e028
Former-commit-id: c0bafd75dd [formerly 9ef5384cd3] [formerly 3368bc1fea10a6726f85b628d6d9cf0561a1b183 [formerly a765656f1d]]
Former-commit-id: 44d629a055583442037212aa5ad1fb19304fe305 [formerly 93010b6cb2]
Former-commit-id: 0751d58e02
2013-06-04 14:57:10 -05:00
Greg Armendariz
8d0abbcafd Merge "Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file." into development
Former-commit-id: 0119000284 [formerly 3c5c1b65e3] [formerly f1fbb33f31] [formerly 0119000284 [formerly 3c5c1b65e3] [formerly f1fbb33f31] [formerly dbdb343fad [formerly f1fbb33f31 [formerly 70379062d2943f045459a03c0de88ec09c1f0853]]]]
Former-commit-id: dbdb343fad
Former-commit-id: 052b511704 [formerly aa94d1e875] [formerly 308057f0728ab28ee2783a66c5517a744823908d [formerly af4fd585a2]]
Former-commit-id: d6c2ff15f8bbe9b54f19a2e9237d023e78d6b524 [formerly 9cc561d73a]
Former-commit-id: 0ee50d0fcd
2013-06-04 14:35:39 -05:00
Greg Armendariz
c1a192e419 Merge "Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro filesystem in rary.ohd.filesystem - it used to be merged into the tar file." into development
Former-commit-id: 7f56d86586 [formerly 50db54dfeb] [formerly eeff0a13e1] [formerly 7f56d86586 [formerly 50db54dfeb] [formerly eeff0a13e1] [formerly ffa5962f52 [formerly eeff0a13e1 [formerly 92f888181ea2d4e4dbfb44623c58a2a547b7e1d8]]]]
Former-commit-id: ffa5962f52
Former-commit-id: 12eab962bf [formerly fb5f888ce1] [formerly e3e7d05f836bcaa14781703582e2093420cadfe7 [formerly a7d5daf5f9]]
Former-commit-id: 4090e5baf8f7115e4707a388a07527bc8906b516 [formerly 3ef9498bcb]
Former-commit-id: 4e11eb1528
2013-06-04 14:35:27 -05:00
Dustin Johnson
e7fcedbec9 Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
Former-commit-id: c4446d26f1 [formerly a98b19c824] [formerly 3198277096] [formerly c4446d26f1 [formerly a98b19c824] [formerly 3198277096] [formerly 37b7e400ea [formerly 3198277096 [formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]]]
Former-commit-id: 37b7e400ea
Former-commit-id: 052d397cac [formerly 533fb7139a] [formerly 3c58657e60d5487cc0a3208db071bbf4465c4d6b [formerly b4a51bc24f]]
Former-commit-id: ce574b64d47c2c2151fb647417847c5bcffff967 [formerly bebc4fdbe5]
Former-commit-id: 2576da68e3
2013-06-04 14:22:59 -05:00
Bryan Kowal
bff32fc252 Issue #2021 - git ignore for build-generated hydro files; remove tmcp build-generated files
Change-Id: I1ae5a3c9a5d93822c6b5ce8190d1bed28e2b6198

Former-commit-id: ffc37683b3 [formerly be4f6b733f] [formerly 6e49c0d761] [formerly ffc37683b3 [formerly be4f6b733f] [formerly 6e49c0d761] [formerly 715d6f490f [formerly 6e49c0d761 [formerly 34bad0464e49f17004ce6b467559bbcdc9bacf59]]]]
Former-commit-id: 715d6f490f
Former-commit-id: 3542a15011 [formerly b485b6d152] [formerly e7df4bec83718c3470a8759de8408122c162440d [formerly 6e329bb0d5]]
Former-commit-id: 7339b7cba893ceaabf0d58d516a6e8ac2fe45821 [formerly 79407e64b2]
Former-commit-id: c32a9a4385
2013-06-04 14:21:15 -05:00
Benjamin Phillippe
4d43c0a1ff Issue #2022 Modifications to subscription last run time
and notificationservers

Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea

Former-commit-id: 5b9eecc8b8 [formerly 0862f2b7d3] [formerly f00d8ae721] [formerly 5b9eecc8b8 [formerly 0862f2b7d3] [formerly f00d8ae721] [formerly 1cec0fab74 [formerly f00d8ae721 [formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]]]
Former-commit-id: 1cec0fab74
Former-commit-id: 8d03dd6c75 [formerly 49ec0363c3] [formerly 3841592d2af8219265cb07e6457697758849bd51 [formerly 6e8314475e]]
Former-commit-id: 434342fc87b6ee05d1fcd27b36ac82d4029eafdd [formerly 585189abb1]
Former-commit-id: d108e2fa66
2013-06-04 14:19:09 -05:00
Richard Peter
ba88ac2d5c Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]]
Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8]
Former-commit-id: 22f6319986
2013-06-04 14:06:53 -05:00
Roger Ferrel
01fdaebda0 Issue #1965 Initial archive retention dialog work.
updated archive creation, purge, and test cases after Roger's last checkin.
added edex plugin for feature.
added an abstract base archive dialog.

Change-Id: I7c9ca3df40a7591815a1aae4fabf660217d44574

Former-commit-id: ef974b52f0 [formerly dcc56ad5d3] [formerly b952eee030] [formerly ef974b52f0 [formerly dcc56ad5d3] [formerly b952eee030] [formerly f53d6bf4ff [formerly b952eee030 [formerly 64b75031afaecd74649392a19cc0b10dcdb79a2b]]]]
Former-commit-id: f53d6bf4ff
Former-commit-id: 8820399134 [formerly 65d17722a9] [formerly 2833276d9329d4f1b9e5d852a18422d57355c145 [formerly 9aff5f2321]]
Former-commit-id: 437bc5403fa76566d08e9f5c3f08a082fb20cba3 [formerly 39cfbf038b]
Former-commit-id: 6f52e3d3f8
2013-06-04 13:08:05 -05:00
Bryan Kowal
604cf5f907 Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file.
Change-Id: Ie625a515e8dc30cacc002bb6d8e77365c1347a13

Former-commit-id: 0d2958f693 [formerly bc1ef2c5fe] [formerly 71b04e3147] [formerly 0d2958f693 [formerly bc1ef2c5fe] [formerly 71b04e3147] [formerly 33a5b6d42d [formerly 71b04e3147 [formerly 02af194872173d89f77e15a6a8caca1e5812dbe4]]]]
Former-commit-id: 33a5b6d42d
Former-commit-id: 398dfd5add [formerly dedddc5811] [formerly 4f0c9557cee74c0a1db544483c367421766de3d2 [formerly 9b896380be]]
Former-commit-id: 4c4a0ffa1c12189fa21e32b791fdf9841a58b135 [formerly 887e1eb88d]
Former-commit-id: 62440f27b3
2013-06-04 12:52:27 -05:00
Nate Jensen
b48efcb46a Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF

Former-commit-id: f4d0188254 [formerly 537b731f6e] [formerly 329d9d1c6a] [formerly f4d0188254 [formerly 537b731f6e] [formerly 329d9d1c6a] [formerly 5d1ecb3a5d [formerly 329d9d1c6a [formerly 6742f7dbcac39261d8bee4e055bb9e4eda66520d]]]]
Former-commit-id: 5d1ecb3a5d
Former-commit-id: e4158f9ece [formerly 412c21f516] [formerly 3ae61c25e5597f9a6be694c5608f437a8ff26eec [formerly 2d1405b9c4]]
Former-commit-id: eadb9a648fcb31ed1a068be92b49e326f53c79ae [formerly 5c2f0ab151]
Former-commit-id: b32e732341
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
e4c8bd3233 Issue #2043 switch capeFunc to java.
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659

Former-commit-id: 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 492b435626 [formerly 098d209d5c [formerly 5eaac7266a0f8d3b083703076a255c41d8bd1039]]]]
Former-commit-id: 492b435626
Former-commit-id: 01e46140cb [formerly 3fd810e0bf] [formerly 7651785a1e4de8202e12adb600233a932a8ec2e8 [formerly 6f9ea3f195]]
Former-commit-id: 932ba59540ac0b812791a35672cd6bc9d4485ccf [formerly 1354e0ceb0]
Former-commit-id: 6c6c593e91
2013-06-04 10:16:53 -05:00
Bryan Kowal
6f896001fe Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro
filesystem in rary.ohd.filesystem - it used to be merged into the tar file.

Change-Id: Id3bdfd69d7bb51581dca8e8c0c64c833ec32f5cc

Former-commit-id: 2f5cbb6757 [formerly 5244c9563f] [formerly abd8ae931c] [formerly 2f5cbb6757 [formerly 5244c9563f] [formerly abd8ae931c] [formerly dc5a800b83 [formerly abd8ae931c [formerly 5080f2839a6f94c6152aeff231241935b570a3c3]]]]
Former-commit-id: dc5a800b83
Former-commit-id: 4df4ccae59 [formerly 96ae06c3a1] [formerly e4c7d77222a7a9b3cef69f5a27ecfe2376ffc717 [formerly 5e4a1576f0]]
Former-commit-id: 6b6eb70247efb5c60e9cd665cd5ce46b0f3f2dfb [formerly b09cce06f7]
Former-commit-id: a8f54dd2ba
2013-06-04 10:05:23 -05:00
Bryan Kowal
83a1fd41d0 Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56

Former-commit-id: eb656f731c [formerly 7a1c08bb13] [formerly 46c9ba7c7b] [formerly eb656f731c [formerly 7a1c08bb13] [formerly 46c9ba7c7b] [formerly 67cd73c655 [formerly 46c9ba7c7b [formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]]]
Former-commit-id: 67cd73c655
Former-commit-id: e49087b23f [formerly 86b88922da] [formerly 9df212446234478c6e77b29334b635f74a7591eb [formerly f8e2a2f4f2]]
Former-commit-id: a0a2edff60b79b0391b1c4924012a7097c13aeee [formerly 36aa500077]
Former-commit-id: 95a5349f85
2013-06-04 09:36:09 -05:00
Bryan Kowal
7fffda1117 Issue #2021 - native hydro code will now compile successfully
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07

Former-commit-id: b222d55e5a [formerly 9ea421356a] [formerly cea990cbe3] [formerly b222d55e5a [formerly 9ea421356a] [formerly cea990cbe3] [formerly 032e26c7ba [formerly cea990cbe3 [formerly 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f]]]]
Former-commit-id: 032e26c7ba
Former-commit-id: 8633568ad4 [formerly f900d7c589] [formerly daf5a8ad8ba627b913cc4ebdc58cd4162ec55b62 [formerly 91a494bde0]]
Former-commit-id: 401d255106cf9fe14b27dd3de96b29916e909192 [formerly 10e5f4e413]
Former-commit-id: 7e30f452b0
2013-06-04 09:22:00 -05:00
Nate Jensen
5ce3f5ea79 Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
Former-commit-id: 1553b4d4d7 [formerly 2de1cec481] [formerly 3151ba277c] [formerly 1553b4d4d7 [formerly 2de1cec481] [formerly 3151ba277c] [formerly a7367c1e1a [formerly 3151ba277c [formerly b442e15efa533e64a2707878e15c52531cd79d5b]]]]
Former-commit-id: a7367c1e1a
Former-commit-id: c8e8c734ee [formerly c9056f278b] [formerly f8e32753a528ec9253f2ccf3b5eb7a14b0d1ec54 [formerly 877e78717b]]
Former-commit-id: aa6c00caa6197e2e5a96f86ac01768fd5ac5686c [formerly 199d9cd20c]
Former-commit-id: 725882e8fd
2013-06-04 09:13:56 -05:00
Max Schenkelberg
ae1104d980 Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75

Former-commit-id: 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 7f76bd3d98 [formerly 3379b100cb [formerly 483247738be16ae76bc2f9891f557960e7ade60e]]]]
Former-commit-id: 7f76bd3d98
Former-commit-id: 084f8cbc05 [formerly e4d27d5d99] [formerly 7f3bd173b51d3949c4a9f8672975f6254b9635b7 [formerly 86d8f1b294]]
Former-commit-id: 9265dbfea39fcf5bc4f77cd090d2dbb8d5f3f939 [formerly a6d84e24b7]
Former-commit-id: 3f67097105
2013-06-03 17:19:18 -05:00
Dustin Johnson
7fdf91ca93 Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63

Former-commit-id: 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]]
Former-commit-id: bc830e67f0
Former-commit-id: efce5e19d5 [formerly cd1db53a35] [formerly ec9fba7ab73ee52c73b56514e1ac66a6a8b5586e [formerly 0b710bc166]]
Former-commit-id: fdc4ef6ee7911f95a849feb6d4d64feef2c9adcb [formerly bdccf71c8b]
Former-commit-id: 13e51bc99c
2013-06-03 14:54:53 -05:00
Nate Jensen
4740fffe4b Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
Former-commit-id: 682ac3f2be [formerly f55fa69ea2] [formerly 5d3b2b98bb] [formerly 682ac3f2be [formerly f55fa69ea2] [formerly 5d3b2b98bb] [formerly b9696149ad [formerly 5d3b2b98bb [formerly c97ca6775122d26f308558eb4e449fb56949b6ba]]]]
Former-commit-id: b9696149ad
Former-commit-id: 327f549f33 [formerly 718ea75857] [formerly 96bbef960bbaa3a9dcb3d3d02763c426f2216ddb [formerly f20b8b3b66]]
Former-commit-id: 1568b3634384e16481f2c927f76b8bb3b0f249c4 [formerly d595d9e84b]
Former-commit-id: dd8729effc
2013-06-03 13:32:21 -05:00
Bryan Kowal
466c50ebc4 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
Former-commit-id: 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 3d885c7a60 [formerly c407dd8623 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]]
Former-commit-id: 3d885c7a60
Former-commit-id: be8aab95e9 [formerly 5a4726bdc2] [formerly 282496ad9a90b4fff81f18018574383b257c142f [formerly 5f637cc57b]]
Former-commit-id: c13d5340a722273a6de1ef2e18e1ecdb0cadba46 [formerly 2050dec254]
Former-commit-id: 7edecdb7dd
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
f9f44c0d18 Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

Former-commit-id: 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]]]
Former-commit-id: a226f225fd
Former-commit-id: 396102ea5d [formerly 97a9a6279b] [formerly 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0]]
Former-commit-id: 6437394e0207ea10e1ae9b421cc9526b14344c70 [formerly 67d1818a64]
Former-commit-id: f482c88c7b
2013-06-03 10:26:36 -05:00
Matt Nash
854a63f7d0 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7895dfa2e4 [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]]
Former-commit-id: cb59b82add
Former-commit-id: efdb42ab54 [formerly c61b9d95e5] [formerly e32c05019af2175b9cb52b0d115b6de5640bce6f [formerly 5d492a4b10]]
Former-commit-id: 054ceaf89a593647c65a3915436f2882db3ed630 [formerly 0d06f59694]
Former-commit-id: 2b85258c26
2013-06-03 09:58:43 -05:00
Ron Anderson
a3e33d4211 Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: 9464771e25 [formerly e6d7b83df5] [formerly 4227600ec53435b3c39496f85e74622ae01b7d76 [formerly f65ce6e3e6]]
Former-commit-id: d45303b850db86b2c970e98ae8be0dd15f308265 [formerly d01a608015]
Former-commit-id: b0f7ac7f1a
2013-06-03 07:45:02 -05:00
Dustin Johnson
20f8e4603b Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
Former-commit-id: 5d4ecc6328 [formerly 72bb21698c] [formerly 3700d27fbf] [formerly 5d4ecc6328 [formerly 72bb21698c] [formerly 3700d27fbf] [formerly 2e420c0963 [formerly 3700d27fbf [formerly 18a9b41a8be832ab1e8da28c32f3b8457704915b]]]]
Former-commit-id: 2e420c0963
Former-commit-id: fe1a709d42 [formerly 5b23635521] [formerly 61046a1c3fa845ece0e8ae8c8320d66cfbcb9b43 [formerly da0335a5e5]]
Former-commit-id: 1608e3e5e84a9f38223153565393b1196e0bbfc7 [formerly b004863550]
Former-commit-id: c8ea8fa5d7
2013-05-31 15:29:04 -05:00
Dave Hladky
01c0565b57 Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b

Former-commit-id: 87e81a8b1b [formerly 39f357570b] [formerly 2f67b74318] [formerly 87e81a8b1b [formerly 39f357570b] [formerly 2f67b74318] [formerly fa8ea8ecca [formerly 2f67b74318 [formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]]]
Former-commit-id: fa8ea8ecca
Former-commit-id: beeaaab97b [formerly 0317090ffd] [formerly d931c9ba679b7ae50fda63241a3da00faf83a9e9 [formerly 9d2ec44182]]
Former-commit-id: 68379ae55b79c37e4c2fca229ff79a44ed58c694 [formerly 1e55f4ade2]
Former-commit-id: d2c1950237
2013-05-31 15:27:45 -05:00
Richard Peter
dce8fe5e96 Merge "Issue #1869 speed up upgrade script for dropping dataURI." into development
Former-commit-id: e3d35f3d06 [formerly 47cdad3880] [formerly c11f08b9ec] [formerly e3d35f3d06 [formerly 47cdad3880] [formerly c11f08b9ec] [formerly 7f129cbe65 [formerly c11f08b9ec [formerly 90b17526aa5b34d159315d9ea98e3022e015e025]]]]
Former-commit-id: 7f129cbe65
Former-commit-id: 0ab13763ab [formerly cce0de878a] [formerly e363a8d201347a607caddbb7d10a04ae39d7608e [formerly 07cf18028d]]
Former-commit-id: f64dd3c855b5afb6e977058f6c794e0de255e3ab [formerly 71ad677568]
Former-commit-id: a75d0506ad
2013-05-31 14:57:16 -05:00
Richard Peter
3cedef94c2 Issue #2058: Update obsPurgeRules.xml and sfcobsPurgeRules.xml
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c

Former-commit-id: 168e447d81 [formerly 7693aef3db] [formerly 948d1aabfe] [formerly 168e447d81 [formerly 7693aef3db] [formerly 948d1aabfe] [formerly 5a8fe397b2 [formerly 948d1aabfe [formerly ea807c13a7cf0ff8a561feb46c99e649eb5254a0]]]]
Former-commit-id: 5a8fe397b2
Former-commit-id: a9290fdd7e [formerly ba36d7c9af] [formerly cdaf4f74592990a0a1b5829de6954b5ceedcb8de [formerly 8d856602e3]]
Former-commit-id: 821443e944d341e6f2a66d9764204dffd3d0120e [formerly 1846685f3f]
Former-commit-id: 4ec5ca19ea
2013-05-31 14:43:43 -05:00
Ben Steffensmeier
5780885509 Issue #1869 speed up upgrade script for dropping dataURI.
Former-commit-id: 3ae99d49a6 [formerly d7a8dc0baf] [formerly 0d34bff004] [formerly 3ae99d49a6 [formerly d7a8dc0baf] [formerly 0d34bff004] [formerly 78f56b32b0 [formerly 0d34bff004 [formerly 075e1cda11aeeef027a106c50d535fd7cb8adf2e]]]]
Former-commit-id: 78f56b32b0
Former-commit-id: 5a4c7791f5 [formerly 640d8e9b6d] [formerly 9cb22087494e004d8402f46057af176301464acb [formerly 2da0c851f0]]
Former-commit-id: c74ed244747940ddced92cd4a2cec2e1eff578e8 [formerly 8908dc03fd]
Former-commit-id: cdf3fbfbc0
2013-05-31 14:43:38 -05:00
Dustin Johnson
061a7d9db4 Issue #2038 Set attribute xml on mock opendap adapter
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083

Former-commit-id: f95e1f4618 [formerly 21b9724304] [formerly 88c8ad3a81] [formerly f95e1f4618 [formerly 21b9724304] [formerly 88c8ad3a81] [formerly 76bdfc3a68 [formerly 88c8ad3a81 [formerly 5bdb3c359d80edfcc0029fb7264809c49f682579]]]]
Former-commit-id: 76bdfc3a68
Former-commit-id: 8888f9e1fb [formerly 4d7c894976] [formerly ad2cd861c2dcd656926d45517cf596108f6a17a9 [formerly 4d71652568]]
Former-commit-id: 994417457be548dbe9f1ec0b9c979f1ef423931e [formerly 9cda6d2f35]
Former-commit-id: 81e74ccbc9
2013-05-31 13:54:41 -05:00
Greg Armendariz
74b2d0e631 Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
Former-commit-id: d1eff126b0 [formerly e333debc2a] [formerly d80ee4dede] [formerly d1eff126b0 [formerly e333debc2a] [formerly d80ee4dede] [formerly f040c69704 [formerly d80ee4dede [formerly e20d4f7898f931deb45db5437625addbb37055c8]]]]
Former-commit-id: f040c69704
Former-commit-id: da8783da2b [formerly cf6938e321] [formerly fb813b88966ebc127a3186f83a308a0a4a446f06 [formerly 0a17b4873f]]
Former-commit-id: 5219c3958575675a9bf654b817ae10ebbb3a23e2 [formerly 561c91a33c]
Former-commit-id: 17d59426bf
2013-05-31 13:29:31 -05:00
Greg Armendariz
bc1043cc1f Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
Former-commit-id: 6fe0ff53c5 [formerly 088407c1c2] [formerly 1eeafcaaf8] [formerly 6fe0ff53c5 [formerly 088407c1c2] [formerly 1eeafcaaf8] [formerly 5e799ba8bc [formerly 1eeafcaaf8 [formerly 47c28707fef620afd9b38d934c6310f7380c44e8]]]]
Former-commit-id: 5e799ba8bc
Former-commit-id: 6b2a53f67d [formerly 1304f0519d] [formerly 546876c1291af7b55af8c27f2fb5478f36eb652c [formerly ceba329f0d]]
Former-commit-id: b4d1d0941197651802fa3a102a895a95cd1afa4b [formerly 2d1ad8d93e]
Former-commit-id: fb5f51c3f2
2013-05-31 13:27:59 -05:00
Richard Peter
83657ef75b Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly fdcf086681 [formerly c2e1b72f9b [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]]]
Former-commit-id: fdcf086681
Former-commit-id: 6d496ca4e8 [formerly 2d3b8706c1] [formerly c97eefc613a06632b1a8aa03a7e670f42dd28610 [formerly 14ef93bf5a]]
Former-commit-id: 82e463238c956ed9be350f85a9486ead68a63d68 [formerly 522dfa3733]
Former-commit-id: 1ac79385f7
2013-05-31 13:01:52 -05:00
Dustin Johnson
347845bc52 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 87605571b2 [formerly 2687ebafd6 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]]
Former-commit-id: 87605571b2
Former-commit-id: 26517c1a95 [formerly 0d77acbff2] [formerly 1373c0b90f4a7aaa2a16437bb66461f4bae2c498 [formerly 1214f5e3ea]]
Former-commit-id: ada7c8e7993ab7276cb65bc026f9c40651ed9c08 [formerly 46ec793d11]
Former-commit-id: 7d59d10204
2013-05-31 12:43:49 -05:00
Dustin Johnson
ecde125343 Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
Former-commit-id: 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 1d06883d7a [formerly 3d8de9e9f3 [formerly 493d8a02f516023a5c0c3620da75e5466c44ede2]]]]
Former-commit-id: 1d06883d7a
Former-commit-id: 5931027de7 [formerly d61d518bdc] [formerly 52ab987a84e9614c5e4516479c934f07c0f6a2b0 [formerly 72d95aac0d]]
Former-commit-id: 5c99ceaa394302743d45f5d6a685c955a489a6d0 [formerly 1027b218f2]
Former-commit-id: d2295a24fe
2013-05-31 12:32:23 -05:00
David Gillingham
8eafbcd92f Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly a11ef45913 [formerly 5b9094275d [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]]
Former-commit-id: a11ef45913
Former-commit-id: eb61d6b8e3 [formerly b77e978008] [formerly 1384cb8b21573990393d2c5eb79b38dc399186fa [formerly 593a5fcbed]]
Former-commit-id: fc9477544adacdd081d02a3a802e8329734ab052 [formerly db859cfe86]
Former-commit-id: c3cdfa4293
2013-05-31 12:25:19 -05:00
Dustin Johnson
8ae74786c1 Issue #2038 Change datadelivery retrieval to be plugin contributable
Amend: Fix class name resolution, no arguments to metadata adapter constructors

Change-Id: I2c08563499a34996502d22f0f9685602b8897139

Former-commit-id: 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]]
Former-commit-id: 55aeff3422
Former-commit-id: d1552d578f [formerly 7ec3c6c09a] [formerly fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d]]
Former-commit-id: 8852d0761a2b6648b34348793d38aa751867d797 [formerly f9ba7dc5ab]
Former-commit-id: d62a0b863a
2013-05-31 12:19:07 -05:00
Ron Anderson
3ff2e5d9c6 Merge "Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
Former-commit-id: 7f15e7e7ab [formerly 1b9e0c2047] [formerly 7e1d2d273f] [formerly 7f15e7e7ab [formerly 1b9e0c2047] [formerly 7e1d2d273f] [formerly c3f8ab24ea [formerly 7e1d2d273f [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]]]
Former-commit-id: c3f8ab24ea
Former-commit-id: fcd98f4e14 [formerly 35f018c206] [formerly 2bade025b66ce81cd9f5c1d5ede35f3f5a87b5ec [formerly b6d6349f09]]
Former-commit-id: 308fbdd189e5a5ebdad0985bb965b5fa39f9b98b [formerly 5b94dbc699]
Former-commit-id: e9fbd70d11
2013-05-31 12:09:49 -05:00
Bryan Kowal
4ed6b1b4a8 Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7
- Amend: update 32-bit rpm build script

Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6

Former-commit-id: a2752092eb [formerly ba097c8a48] [formerly a78c84dcd7] [formerly a2752092eb [formerly ba097c8a48] [formerly a78c84dcd7] [formerly 203d886739 [formerly a78c84dcd7 [formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]]
Former-commit-id: 203d886739
Former-commit-id: 2f4e04a818 [formerly e6da4debed] [formerly 41783f7e227512d37dd7ab56c04b1bec2805ea4f [formerly f63c05e5cf]]
Former-commit-id: 01fd4a99ce6002c4b9895e20ce6d445193adaa51 [formerly c6f4a5455f]
Former-commit-id: 3c1968bb5d
2013-05-31 11:47:09 -05:00
Greg Armendariz
f75e134299 Merge "Issue #2053: Add dx2f to capture" into omaha_13.4.1
Former-commit-id: 7f82e30d73 [formerly 34e1b80460] [formerly 63fcb26312] [formerly 7f82e30d73 [formerly 34e1b80460] [formerly 63fcb26312] [formerly 5052a7f3f5 [formerly 63fcb26312 [formerly ca827b6fac3130f4ca0403bba860182215f8a6f2]]]]
Former-commit-id: 5052a7f3f5
Former-commit-id: 4ce40beb30 [formerly ae082f94c9] [formerly 636c49fa489c2be25ef8ad888b2c29b3cc90c2a5 [formerly 9e57f1869e]]
Former-commit-id: 926e913f3f334bd03687a67abdbc4280f338a182 [formerly d67ec97699]
Former-commit-id: 2d5ce9a11e
2013-05-31 11:44:12 -05:00
Richard Peter
9b57e1fe35 Merge "Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp. Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626" into omaha_13.4.1
Former-commit-id: 8dbc5fbf26 [formerly 3ae3f6a0cb] [formerly 5da3e64528] [formerly 8dbc5fbf26 [formerly 3ae3f6a0cb] [formerly 5da3e64528] [formerly 1fc1c77189 [formerly 5da3e64528 [formerly d971f21d651d351fa05ee96a50f5183c2a95df87]]]]
Former-commit-id: 1fc1c77189
Former-commit-id: 8c4e1b2d66 [formerly f77ef2196d] [formerly f909df7b8b04aa96c56d5d07add6fbee29d82f1b [formerly 2dc6232ba0]]
Former-commit-id: 061051cbadf876a6e98749de6b57ccfaafa996c9 [formerly 7b6b40e31d]
Former-commit-id: 095c5459ad
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
8f22a93919 Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626

Former-commit-id: a5611b16d9 [formerly 36cd455621] [formerly da73b0fd4e] [formerly a5611b16d9 [formerly 36cd455621] [formerly da73b0fd4e] [formerly 7ae82832d1 [formerly da73b0fd4e [formerly fba34b77a870a2fc1d6b4301dc3a4d61ce424f67]]]]
Former-commit-id: 7ae82832d1
Former-commit-id: b748dd3393 [formerly 66cc26f78b] [formerly 3baf5472d719747b03982686857a8604a64ebb27 [formerly d720c0fa3f]]
Former-commit-id: c23cfb4a400a52446540a1e9b754d210a9edab16 [formerly 7cb83e5c64]
Former-commit-id: 82bd402966
2013-05-31 11:39:50 -05:00
David Gillingham
9f86529f94 Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path.
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b

Former-commit-id: 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly cab1c849bf [formerly 3ccf091c44 [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]]
Former-commit-id: cab1c849bf
Former-commit-id: e4626b7534 [formerly 912212b953] [formerly c70bfb52dbc0daf601b003261f6af93be9c8e983 [formerly df9c5492c8]]
Former-commit-id: 3ec56baf9412693f3e3e2e387ae597846f5dfbbb [formerly 06bfd0413c]
Former-commit-id: ca548953d2
2013-05-31 10:42:51 -05:00
Richard Peter
a291f47841 Issue #2053: Add dx2f to capture
Former-commit-id: 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly d4cf7a1312 [formerly d8d7c01705 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]]]
Former-commit-id: d4cf7a1312
Former-commit-id: e23a5ddc08 [formerly 4f7125d343] [formerly 7976f75a4ecd8105bf1fea42677f574d7cd1b78e [formerly 337efabc5a]]
Former-commit-id: e92cf1d0019c1b279749e27a8b2c153e951083cc [formerly 43b0fa7d11]
Former-commit-id: 896593c691
2013-05-31 10:37:48 -05:00