Commit graph

5476 commits

Author SHA1 Message Date
Nate Jensen
cdf8aeef79 Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 8a4e3b8088 [formerly 0845eef927] [formerly 7e19d70363 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]
Former-commit-id: 7e19d70363
Former-commit-id: 27cfffb1ea
2014-04-15 10:54:39 -05:00
Nate Jensen
78f6cc513c Merge "Issue #2785 - Fix loading of groups in sub request dialog" into development
Former-commit-id: 03f60e7989 [formerly b574103f0f] [formerly 70f35c6a31 [formerly 7643dcd902ee2ab068d30ff88774114636d545c9]]
Former-commit-id: 70f35c6a31
Former-commit-id: 4c7b2c7f16
2014-04-15 10:44:28 -05:00
Mike Duff
0bf14203ff Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: 3a6e718ff0 [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly e72a852935dcb519604b37dc873645d4b419ee43]]
Former-commit-id: d2a80ca966
Former-commit-id: 4773c3722c
2014-04-15 10:10:18 -05:00
Nate Jensen
23c3186365 Merge "Issue #2984 attempt to fix build" into development
Former-commit-id: 37028f77b3 [formerly 9399b1a69f] [formerly 41e565f368 [formerly 41626c3c65aea888213bdf10e434e87dde793d97]]
Former-commit-id: 41e565f368
Former-commit-id: 0a8abf9808
2014-04-15 10:09:57 -05:00
Nate Jensen
0177329d67 Issue #2984 attempt to fix build
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d

Former-commit-id: ce585ca9e4 [formerly 4aaa7c7096] [formerly 456359ab1a [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]
Former-commit-id: 456359ab1a
Former-commit-id: f6b3c3c05f
2014-04-15 09:57:11 -05:00
Mike Duff
f749f9b8d6 Issue #2907 - Rename com.raytheon.edex.dataplugin.redbook to com.raytheon.uf.edex.dataplugin.redbook
Change-Id: I375877b285671ef7a4d993b4c16ee3437fd0a32a

Former-commit-id: 9c690f8ecc [formerly 8d5486d1ff] [formerly a072ce72bb [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]
Former-commit-id: a072ce72bb
Former-commit-id: 25eff8dcf5
2014-04-15 09:34:05 -05:00
Richard Peter
1a3df8b3a4 Merge "Issue #2984 remove unnecessary plugins from features remove unnecessary uengine dependencies from manifests" into development
Former-commit-id: 93d624d4d5 [formerly 4edf560b06] [formerly 909c44182b [formerly faa4e88621db7dd9cbc13048bfdf98cdb3ec26d2]]
Former-commit-id: 909c44182b
Former-commit-id: e6112f7aeb
2014-04-14 17:13:57 -05:00
Nate Jensen
46a070288b Merge "Issue #3019 modify JUtil to support sets and frozensets" into development
Former-commit-id: f677b2123e [formerly f11c71e083] [formerly 5308cb61cc [formerly 6a8cbb3713741df343daf3d128d7d3b4e29238ec]]
Former-commit-id: 5308cb61cc
Former-commit-id: 0192d15ffb
2014-04-14 16:53:28 -05:00
Nate Jensen
97f09968b3 Issue #2984 remove unnecessary plugins from features
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: e24940ead6 [formerly 6e2d68e102] [formerly 57f2357f10 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]
Former-commit-id: 57f2357f10
Former-commit-id: d435258fce
2014-04-14 16:50:54 -05:00
Matt Nash
de47d76f3c Issue #3019 modify JUtil to support sets and frozensets
Change-Id: Ia72d8c1670c0adb1529937b1943fa9e2d1195692

Former-commit-id: 1e3afba948 [formerly 02e801b359] [formerly ef3879c4a3 [formerly 795cba334038d920beab93f5c872b02acf29c7f9]]
Former-commit-id: ef3879c4a3
Former-commit-id: 7c6fe31032
2014-04-14 16:26:38 -05:00
Nate Jensen
9593960e9f Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development
Former-commit-id: d741f996c6 [formerly c71205eb89] [formerly 111b7f4283 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]
Former-commit-id: 111b7f4283
Former-commit-id: 9917a8ef62
2014-04-14 15:46:14 -05:00
Nate Jensen
efc88926bc Merge "Issue #2937 Moved presence/site determination from feed log to feed listener. Use MUCRoom to get presence and role because UserManager is not able to understand nicnames." into development
Former-commit-id: c8da0cad7a [formerly 8410d02508] [formerly 23fc6b53db [formerly 2ae8617d26a4d9d77ef439333d886883812e86ce]]
Former-commit-id: 23fc6b53db
Former-commit-id: 985325091f
2014-04-14 15:35:43 -05:00
Nate Jensen
0e4305296c Merge "Issue #2937 Fixed from user in xmpp message." into development
Former-commit-id: 5ded9b0bae [formerly 9aa730cfd8] [formerly 85c5f8f64f [formerly 9fc178c2b8cfcbafbe9848076998d29af0f55912]]
Former-commit-id: 85c5f8f64f
Former-commit-id: 4c6151f4cb
2014-04-14 15:33:04 -05:00
Ron Anderson
d2346699bb Merge changes Ic5c0dcaa,Iae10909e into development
* changes:
  Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
  Issue #2947 Make GridCoverage implement IGridGeometryProvider.


Former-commit-id: d5ebb5a800 [formerly 46d5349940] [formerly fd79bd354b [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]
Former-commit-id: fd79bd354b
Former-commit-id: 5ab1b1b95c
2014-04-14 14:45:03 -05:00
Brad Gonzales
b18cefb6bd Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 45264a2cde [formerly 189282166d] [formerly 535611f556 [formerly e975a825046c8d0505223093e5765d5283425b2f]]
Former-commit-id: 535611f556
Former-commit-id: 7384a458eb
2014-04-14 14:30:18 -05:00
Brad Gonzales
2812984f88 Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 98476d4813 [formerly 023622a2c5] [formerly f76e4e8fea [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]
Former-commit-id: f76e4e8fea
Former-commit-id: 1f1806de88
2014-04-14 14:30:18 -05:00
Nate Jensen
dfe50ee038 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 40d1fda798 [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]
Former-commit-id: ceec3d48f0
Former-commit-id: 715932091e
2014-04-14 14:28:11 -05:00
Lee Venable
bf4f3c75ef Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development
Former-commit-id: 1a3738c8fd [formerly f6601d6bcc] [formerly d4a6ce546d [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]
Former-commit-id: d4a6ce546d
Former-commit-id: caf31402d7
2014-04-14 14:09:03 -05:00
Nate Jensen
b31de05482 Merge "Issue #2726: Add BoundedMap" into development
Former-commit-id: c53d411da1 [formerly 2ed5535235] [formerly 797eb5e8cf [formerly bf775eff602039caa654ab2f810befd3a89e3808]]
Former-commit-id: 797eb5e8cf
Former-commit-id: 450ceb3149
2014-04-14 14:07:49 -05:00
Richard Peter
c4853e7982 Merge "Issue #2862 Implements locks on case creation." into development
Former-commit-id: 22a01edbb7 [formerly 19755418f8] [formerly 181ffee3db [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]
Former-commit-id: 181ffee3db
Former-commit-id: 0abb97820b
2014-04-14 13:28:26 -05:00
Richard Peter
0956165881 Issue #2726: Add BoundedMap
Former-commit-id: 33707d4c7d [formerly 7c618f20d7] [formerly 9f91e47338 [formerly bf56d51e161d00b3f5156b957203d616e971c23e]]
Former-commit-id: 9f91e47338
Former-commit-id: 6b57e9339f
2014-04-14 13:25:53 -05:00
Richard Peter
ff87317bd4 Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]
Former-commit-id: 17196b5dcd
Former-commit-id: 8b279966d1
2014-04-14 13:10:11 -05:00
Everett Kladstrup
3a08b8d2ad Issue #2725 Fix imports in python after derived param move
Former-commit-id: e36ac5e32a [formerly 7e8e756798] [formerly 46c55750f1 [formerly 1680849c4b86113b74228d54b058d6af89311514]]
Former-commit-id: 46c55750f1
Former-commit-id: 0768b55e79
2014-04-14 09:36:57 -05:00
Nate Jensen
60ee75d3df Merge "Issue #2241 fix tear off menus in practice mode" into development
Former-commit-id: 2a0c73fb25 [formerly 47eb9ecb0a] [formerly 5fe4c08ab6 [formerly 4fedbaacf54b5194afb9548101badc4619347638]]
Former-commit-id: 5fe4c08ab6
Former-commit-id: f77b99b51c
2014-04-14 09:28:34 -05:00
Nate Jensen
4648e4b9b8 Merge "Issue #2725 Adding user/site derivparam migrate script" into development
Former-commit-id: a2db252625 [formerly fc4d9a79ce] [formerly 9ad6b06ac9 [formerly ea7a0b963bf90c657c574fb40e67e54c1f33c203]]
Former-commit-id: 9ad6b06ac9
Former-commit-id: 65fda3c736
2014-04-14 08:59:21 -05:00
Nate Jensen
3147ae5d77 Merge "Issue #2675 - Change GAFF to be called from Quartz. Added spring file." into development
Former-commit-id: 507e7f9ede [formerly 26aea6d880] [formerly 8b1543c60c [formerly f50ab285eb616ec2867907410deb3862875304e9]]
Former-commit-id: 8b1543c60c
Former-commit-id: 4a85486395
2014-04-14 08:58:55 -05:00
Lee Venable
fd6c60d719 Merge "Issue #2940 Better error message for bad XMRG config in FFMP Change-Id: I0ed88a33dc7fe78dcccb7af212a3180d3124ca4f" into development
Former-commit-id: 5b0ce64d6c [formerly e90d3e6617] [formerly a757e93e34 [formerly b5bfbf426454f6a08c0d5a4498b99830ddf3d49e]]
Former-commit-id: a757e93e34
Former-commit-id: 3962aafa98
2014-04-14 08:57:37 -05:00
Nate Jensen
f6dd8af04d Merge "Issue #2971 - Added condition to avoid malformed parts in the message." into development
Former-commit-id: 3329bd8cd1 [formerly 9604225111] [formerly ce2fc531d9 [formerly 0a0e5357f34f0513a78a3cdae922283a3cc183bb]]
Former-commit-id: ce2fc531d9
Former-commit-id: d9807d5fa3
2014-04-14 08:56:57 -05:00
Richard Peter
a4eba6e6df Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]
Former-commit-id: 9ef8347f23
Former-commit-id: ffd74e6787
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
b120feab6f Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]
Former-commit-id: 428f3a2d8b
Former-commit-id: 6c92b645f0
2014-04-11 17:37:59 -05:00
Ben Steffensmeier
b707e3b6db Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
Former-commit-id: ca78a04d95 [formerly d5b91d8846] [formerly 1ad8396366 [formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]
Former-commit-id: 1ad8396366
Former-commit-id: fb85857ff5
2014-04-11 17:34:38 -05:00
Ben Steffensmeier
a741091a55 Issue #2947 Make GridCoverage implement IGridGeometryProvider.
Former-commit-id: 22f068481f [formerly 037ed878b7] [formerly e911a4c917 [formerly f2a204c593f65c67c87e16fa513d00383ad568e5]]
Former-commit-id: e911a4c917
Former-commit-id: 6666898f1d
2014-04-11 17:33:55 -05:00
Richard Peter
d65b11d404 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: cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a7ec0bcf66
2014-04-11 16:23:09 -05:00
Roger Ferrel
c5de39c162 Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b

Former-commit-id: 16fab01b8b [formerly 5570261d74] [formerly cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]
Former-commit-id: cfea0489d7
Former-commit-id: d66a346c65
2014-04-11 16:07:58 -05:00
Dave Hladky
d19ca5f565 Issue #2940 Better error message for bad XMRG config in FFMP
Change-Id: I0ed88a33dc7fe78dcccb7af212a3180d3124ca4f

Former-commit-id: 659b5c8b10 [formerly 9a4e61d507] [formerly 00019f27c1 [formerly b64527b6d538eafc4ae3cc49a32f54c9f44e118a]]
Former-commit-id: 00019f27c1
Former-commit-id: 2dc4afddc5
2014-04-11 15:09:14 -05:00
Slav Korolev
79514751bf Issue #2971 - Added condition to avoid malformed parts in the message.
Change-Id: Ic8e7351faad4e1b65939d568d307ec5a4789f4ec

Former-commit-id: c53687c5ec [formerly 1dce366e88] [formerly 042014c2a7 [formerly 4afbf3339470bec70c0cb958a0379c48c6103fd3]]
Former-commit-id: 042014c2a7
Former-commit-id: ea9c8bd878
2014-04-11 11:54:57 -04:00
Richard Peter
b4cc44faa0 Merge "Issue #2864 - Change how saved subset files are stored." into development
Former-commit-id: 69c6217ae9 [formerly 8a682a5e23] [formerly 695878c6aa [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]
Former-commit-id: 695878c6aa
Former-commit-id: 0fa4180959
2014-04-11 09:41:31 -05:00
Richard Peter
f3125d1a87 Merge "Issue #2905 modified ucar BUFR library to fix bug" into development
Former-commit-id: e235baf81d [formerly 4681ba4a76] [formerly 8e33f38232 [formerly 84fd4953a8aaf0ada4dbb96e3fea911b43247bc7]]
Former-commit-id: 8e33f38232
Former-commit-id: 032c8b17bd
2014-04-11 09:40:36 -05:00
Ron Anderson
19638b6d43 Merge "Issue #2730 remove extracted numpy directories and files" into development
Former-commit-id: b768cea758 [formerly 6d55f4a7c7] [formerly de12c875f2 [formerly 9c4b8db9c034dcf4ce2eb1302fca38ae6a909874]]
Former-commit-id: de12c875f2
Former-commit-id: 632a1e4592
2014-04-11 08:46:17 -05:00
Mike Duff
dc2a5b0c6f Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: a58f279b54 [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]
Former-commit-id: 890faf2d73
Former-commit-id: 6d8bead4a7
2014-04-11 08:27:42 -05:00
Mike Duff
b0808d2e33 Issue #2675 - Change GAFF to be called from Quartz. Added spring file.
Change-Id: I38f2890097e074cc42735657855ffff97a455707

Former-commit-id: efc9fb3a72 [formerly 069acec611] [formerly 9e0d6b3b1f [formerly c75780f9e3c7b9a5447b0f72b11e42a3c8dce68b]]
Former-commit-id: 9e0d6b3b1f
Former-commit-id: 3d146a780b
2014-04-11 08:15:51 -05:00
Everett Kladstrup
f40a46aef0 Issue #2725 remove wxmath from edex.common.core
Former-commit-id: 8e726ad379 [formerly c2d27d11f2] [formerly 25414de245 [formerly 84b372c36f8f0ef707f124e06fe32eb2b41d8b0f]]
Former-commit-id: 25414de245
Former-commit-id: fed45e26d8
2014-04-10 17:42:07 -05:00
Everett Kladstrup
8a449daa8d Issue #2725 Adding user/site derivparam migrate script
Former-commit-id: 0f9228c686 [formerly b4e353332b] [formerly a0edd808b0 [formerly 8c37f0716051384e6364ffa30a6dd0a4649fb96b]]
Former-commit-id: a0edd808b0
Former-commit-id: fcca67d5ee
2014-04-10 17:15:44 -05:00
Nate Jensen
7f32159599 Merge "Issue #2937 Connect to the venue after the feed view is available." into development
Former-commit-id: c7593d61c4 [formerly 5fc6942fab] [formerly b3b9dbff67 [formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]
Former-commit-id: b3b9dbff67
Former-commit-id: 4a395ff2bc
2014-04-10 16:59:17 -05:00
Brian Clements
81f93a1929 Issue #2905 modified ucar BUFR library to fix bug
Former-commit-id: 00c0403ec5 [formerly 184c2c3d77] [formerly 640391682f [formerly d340cd72b224dedec1839bfdc75873faa8140ea9]]
Former-commit-id: 640391682f
Former-commit-id: 0d8909db10
2014-04-10 16:43:10 -05:00
Nate Jensen
4898952f4f Merge "Issue #2725 Moving derivparam plugins to the lowest applicable features" into development
Former-commit-id: 2fc2442dc4 [formerly e1dbbe718b] [formerly 59d51c7d0b [formerly 653d2d2ef03b8f2b7a5c214d8e9b7b6284fe6b7b]]
Former-commit-id: 59d51c7d0b
Former-commit-id: 51400be34f
2014-04-10 16:36:26 -05:00
Everett Kladstrup
70a383f68d Issue #2725 Moving derivparam plugins to the lowest applicable features
Former-commit-id: 7fd3d7ce3d [formerly b074c88957] [formerly ed0c157e33 [formerly 4397d0c6018858ab967110884cfdb7771c08e199]]
Former-commit-id: ed0c157e33
Former-commit-id: b9f67d3bae
2014-04-10 16:00:22 -05:00
Richard Peter
8185a9120c Merge "Issue #2906 removed accidental manifest entry for bufr obs" into development
Former-commit-id: 868d32cbbc [formerly 2b28e47e44] [formerly b2962db1f0 [formerly 6aad1ccde2c4a0b50e6f11cca6690b039a393568]]
Former-commit-id: b2962db1f0
Former-commit-id: 2955520b41
2014-04-10 15:54:34 -05:00
Brian Clements
b83dc2f4e9 Issue #2906 removed accidental manifest entry for bufr obs
Former-commit-id: c4bbcc0688 [formerly f2d2cab0fc] [formerly e8708eb44d [formerly 76eb62c08d300e5c47321b9ecbfe65814bcf2960]]
Former-commit-id: e8708eb44d
Former-commit-id: ca43897d73
2014-04-10 15:31:53 -05:00
Nate Jensen
17bf6198d9 Merge "Issue #2725 Put derivparam plugins in viz and edex separately" into development
Former-commit-id: ecafc30027 [formerly ffc903d5c4] [formerly 7f8478ee0b [formerly 7e57057056f7bf092336a915a2bfec652be268eb]]
Former-commit-id: 7f8478ee0b
Former-commit-id: 11fd8d8055
2014-04-10 15:12:24 -05:00