Commit graph

5177 commits

Author SHA1 Message Date
Brad Gonzales
7dddf974b8 Issue #2828 Added purge cron to Central SBN Simulator.
Amend: Removed comment accidentally merged from other branch.
       Moved logging to outer loop and log count of purged files for each dir.

Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6

Former-commit-id: 290a381715 [formerly 12e22752c2] [formerly 290a381715 [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: bef4e8ee53 [formerly 08c4d1afea]
Former-commit-id: 675477ed66
2014-02-20 16:31:16 -06:00
Mike Duff
692830c5c9 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: a96a833f51 [formerly ed5cb91406] [formerly a96a833f51 [formerly ed5cb91406] [formerly a7b1e79d2d [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: f98eec12b9 [formerly d90f4495c2]
Former-commit-id: 5014499431
2014-02-20 15:09:10 -06:00
Brian.Dyke
176c56b8ea ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]
Former-commit-id: 916f657e04
Former-commit-id: 9ce06f52c4 [formerly e36ae1dd7f]
Former-commit-id: f89f664f50
2014-02-20 15:50:50 -05:00
Ron Anderson
42048983ce Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: e4aeaa79f1 [formerly 6a7e4a147d] [formerly e4aeaa79f1 [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: 1dcaf2b790 [formerly d63ad1b1de]
Former-commit-id: 2eb6cb45e3
2014-02-20 12:32:31 -06:00
Brian Clements
1d2406e180 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: a2bdfa25cc [formerly aaa2de20f4] [formerly a2bdfa25cc [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 04697836b8 [formerly 4b7ba54dc3]
Former-commit-id: e3973b9fc7
2014-02-20 11:50:54 -06:00
Brian Clements
9b0fd74f5b Issue #2751 implemented room/topic ownership transfer
Former-commit-id: a8ff1effc1 [formerly c3cadff705] [formerly a8ff1effc1 [formerly c3cadff705] [formerly ab72938246 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: 9d00fe2bab [formerly d9ac2c0037]
Former-commit-id: d218686d1f
2014-02-20 11:10:14 -06:00
Nate Jensen
3955f66213 Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 6ef26a636c [formerly 32bd9fd635] [formerly 6ef26a636c [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7 [formerly 9f33e97c1b]
Former-commit-id: 1f5f895dcf
2014-02-20 10:53:21 -06:00
Ron Anderson
a5c6428787 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: 810ad594a1 [formerly c13942140a] [formerly 810ad594a1 [formerly c13942140a] [formerly 6f4a63000d [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]
Former-commit-id: 6f4a63000d
Former-commit-id: ee5658f9d9 [formerly c07544b904]
Former-commit-id: 32b8cc8a8e
2014-02-20 09:55:56 -06:00
Ron Anderson
30d9fec3ae Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 2bfa521e7d [formerly 6b6aa14e59] [formerly 2bfa521e7d [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]
Former-commit-id: 08a1be844d
Former-commit-id: 0ee3625c50 [formerly 1571b9a8eb]
Former-commit-id: 7897be61e2
2014-02-20 09:34:18 -06:00
Nate Jensen
4628b0c67c Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 4563e38db2 [formerly 3078b69273] [formerly 4563e38db2 [formerly 3078b69273] [formerly 5856957c57 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: c936a659a5 [formerly 5412b72c57]
Former-commit-id: 9e261c9c22
2014-02-19 17:22:00 -06:00
Nate Jensen
1db1ae5a38 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 3782880dac [formerly 9011e1b31e] [formerly 3782880dac [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9394879520 [formerly b1e2788958]
Former-commit-id: 8f73511086
2014-02-19 17:18:24 -06:00
Nate Jensen
dbdcfa8e41 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: a241472c34 [formerly df376abcb7] [formerly a241472c34 [formerly df376abcb7] [formerly f99cf7df47 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: d3ec0da1bb [formerly 8b152a8027]
Former-commit-id: dafb323edb
2014-02-19 16:19:27 -06:00
Ron Anderson
331803d94a Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: 8703c43937 [formerly 98d2417f94] [formerly 8703c43937 [formerly 98d2417f94] [formerly b8c00d8ead [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: b9904edc3a [formerly 7e7f0abfdc]
Former-commit-id: db9cc1e6b5
2014-02-19 15:39:56 -06:00
Mike Duff
401973b39e Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: e2a6251a6b [formerly 663ea8decd] [formerly e2a6251a6b [formerly 663ea8decd] [formerly 95fcee385a [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 89c4a3e04b [formerly 3100a71f34]
Former-commit-id: 92d356f4f0
2014-02-19 15:26:14 -06:00
Mike Duff
0494f646ab Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 48a0b34b5f [formerly 682c6af456] [formerly 48a0b34b5f [formerly 682c6af456] [formerly 183657fb33 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 8be2622f85 [formerly 86fce9d547]
Former-commit-id: 06b243a7fd
2014-02-19 15:20:29 -06:00
Nate Jensen
659bc630be Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: b4ac186728 [formerly 4b4cca776f] [formerly b4ac186728 [formerly 4b4cca776f] [formerly c72e2be969 [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]
Former-commit-id: c72e2be969
Former-commit-id: 5ef747c703 [formerly 7099b45023]
Former-commit-id: 696937bfcc
2014-02-19 14:52:24 -06:00
Lee Venable
f645277518 Merge "Issue #2734 - default time range to 24 hours." into development
Former-commit-id: de102f4e94 [formerly 8e967e8e59] [formerly de102f4e94 [formerly 8e967e8e59] [formerly e204b350ee [formerly 4604b591b1f15621fcf4cd0e93143435cccfe43b]]]
Former-commit-id: e204b350ee
Former-commit-id: 404a4c3149 [formerly 9cb8925e51]
Former-commit-id: 67f6df9784
2014-02-19 12:33:46 -06:00
Ron Anderson
e91fd1d683 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 663cb4cb62 [formerly 5258aecf45] [formerly 663cb4cb62 [formerly 5258aecf45] [formerly 419e9d0b8d [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 908e43039e [formerly 8a41723ba6]
Former-commit-id: b0a4b63689
2014-02-19 11:55:11 -06:00
Slav Korolev
8ab22e3559 Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b

Former-commit-id: f7a6a6c613 [formerly a597ac0989] [formerly f7a6a6c613 [formerly a597ac0989] [formerly 3b1ea13cb1 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]]
Former-commit-id: 3b1ea13cb1
Former-commit-id: 06d55c28f4 [formerly 8ec2d02f52]
Former-commit-id: f09add5f92
2014-02-19 12:01:06 -05:00
Mike Duff
304a9dc507 Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d

Former-commit-id: bc180503b1 [formerly 19033601bf] [formerly bc180503b1 [formerly 19033601bf] [formerly 0b316f7bd9 [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: 06ed3db690 [formerly 7710724c5a]
Former-commit-id: e6fb8413b9
2014-02-19 10:23:48 -06:00
Matt Nash
1814b1448e Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization

Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2

Former-commit-id: 3f67324d7c [formerly 2d20e84f6a] [formerly 3f67324d7c [formerly 2d20e84f6a] [formerly 1835019567 [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: ae1d36b6d0 [formerly bb10484bd0]
Former-commit-id: 3b39e1d2bc
2014-02-19 10:01:25 -06:00
Brian Clements
b47b194564 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: 06c16118e1 [formerly dc074a9650] [formerly 06c16118e1 [formerly dc074a9650] [formerly 3a135b8eac [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 77bb396c9a [formerly bee7cdb71a]
Former-commit-id: ddc0945e40
2014-02-19 08:32:26 -06:00
Lee Venable
7dca9cdace Merge "Issue #2596 - Add check for null coordinates." into development
Former-commit-id: 1620d0fb22 [formerly 6e60748b41] [formerly 1620d0fb22 [formerly 6e60748b41] [formerly c871e4c872 [formerly e3517f5144c386038c4d535d79e62ec02d504f9f]]]
Former-commit-id: c871e4c872
Former-commit-id: 110557f42c [formerly d62b4e7621]
Former-commit-id: 875ebbd2e1
2014-02-18 18:08:10 -06:00
Nate Jensen
51e9dec1c0 Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: 82fde2011c [formerly 698a4f827d] [formerly 82fde2011c [formerly 698a4f827d] [formerly 713ec598c3 [formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]]]
Former-commit-id: 713ec598c3
Former-commit-id: 05edfb90d5 [formerly 79cbb8d79a]
Former-commit-id: 93458ab911
2014-02-18 17:35:39 -06:00
Mike Duff
a4ab323833 Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: 283b0c670c [formerly a6509aad8c] [formerly 283b0c670c [formerly a6509aad8c] [formerly 9754f0d8dd [formerly 11f3705080210161e6915309a4aec423b307cce8]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: 40b0540830 [formerly ecb0d45b24]
Former-commit-id: 7ba61e6b53
2014-02-18 17:32:32 -06:00
Nate Jensen
337aa2f312 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: ac0a10678b [formerly 020d54c48a] [formerly ac0a10678b [formerly 020d54c48a] [formerly b08d96b1e8 [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749 [formerly a6bb05f2e3]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
4a4ff1e02d Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: add98f22b1 [formerly 3e0cba04c0] [formerly add98f22b1 [formerly 3e0cba04c0] [formerly e19b4518ef [formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]]]
Former-commit-id: e19b4518ef
Former-commit-id: 2be385e6b8 [formerly 399e3d3f07]
Former-commit-id: 4e57fcf1f2
2014-02-18 13:57:28 -06:00
David Gillingham
5911f4b2d4 Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 607ce13c19 [formerly 32719432ff] [formerly 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: a83191356d [formerly 1520317c24]
Former-commit-id: 474dda75de
2014-02-18 13:24:37 -06:00
Richard Peter
bbce2567a7 Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
Former-commit-id: c666adb530 [formerly 3ed6ad64ce] [formerly c666adb530 [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]
Former-commit-id: d19e464a1a
Former-commit-id: f7e43bdabd [formerly 3c4e188037]
Former-commit-id: ccd90f2d86
2014-02-18 12:44:57 -06:00
Lee Venable
e4869a93ad Merge "Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now." into development
Former-commit-id: 7f3b6413e6 [formerly adec7acc7c] [formerly 7f3b6413e6 [formerly adec7acc7c] [formerly d9bccda151 [formerly 81d300630a64d9077e5b3a801e722fd10de4119e]]]
Former-commit-id: d9bccda151
Former-commit-id: e74e805bb6 [formerly 8b8c5d2258]
Former-commit-id: 3d2cbdcd21
2014-02-18 12:21:30 -06:00
Lee Venable
0bd01db3cc Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
Former-commit-id: e9226e7140 [formerly 0cf2dba731] [formerly e9226e7140 [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: 46dbd967a5 [formerly 6fc9dcb3b1]
Former-commit-id: 28b0809a1c
2014-02-18 12:19:41 -06:00
Ron Anderson
f82e2401da Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
Former-commit-id: fc5aa71b86 [formerly a860ff3e6e] [formerly fc5aa71b86 [formerly a860ff3e6e] [formerly 7ab79d8b3a [formerly ecece1009e1508451569b3d065e30820819a0502]]]
Former-commit-id: 7ab79d8b3a
Former-commit-id: 5c08871d87 [formerly 33adfffab9]
Former-commit-id: 97e125cbd2
2014-02-18 12:12:25 -06:00
Brad Gonzales
d50a8cd7a5 Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
Amend: updated test envlope sizes.
       fixed ticket numbers in software history.

Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5

Former-commit-id: 49ddffc99b [formerly 36a24c1cb5] [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 3bb9975728 [formerly 90d34f7386]
Former-commit-id: b99b5d9373
2014-02-18 12:11:02 -06:00
Mike Duff
2467a11a7e Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 33f81d8822 [formerly 89bd047283] [formerly 33f81d8822 [formerly 89bd047283] [formerly 911789b910 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]
Former-commit-id: 911789b910
Former-commit-id: 42e6591bc8 [formerly 5f9d913c6d]
Former-commit-id: d277c1caf1
2014-02-18 12:05:26 -06:00
Nate Jensen
1e6b1343b0 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: 1738248fac [formerly c63289fa14] [formerly 1738248fac [formerly c63289fa14] [formerly b3c45b303c [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: 2e468e9ec1 [formerly 173c646576]
Former-commit-id: b1dc1e8849
2014-02-18 11:22:19 -06:00
Brian Clements
c38397e00b Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 9095a1584f [formerly a28fcf0dc5] [formerly 9095a1584f [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 9d9c4c7c27 [formerly 510c39713f]
Former-commit-id: 3bf2a08c57
2014-02-18 11:11:33 -06:00
Brad Gonzales
b0421675ff Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 379c0fb46c [formerly 19460ed0d7] [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111 [formerly 3be3380944]
Former-commit-id: 9aa1cb299e
2014-02-18 11:10:44 -06:00
Ron Anderson
8a7af092f2 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: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
2014-02-18 10:45:20 -06:00
Brian Clements
f866ac4365 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: f0c89ef6c6 [formerly f6b2827434] [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4 [formerly a1d9e40bd4]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Dave Hladky
51b644bf0c Issue #2786 Pending subscriptions don't work.
Former-commit-id: 24a4fab603 [formerly 5c11dd09bb] [formerly 24a4fab603 [formerly 5c11dd09bb] [formerly 7ee101d7c7 [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: 012619f05f [formerly 78d41d01bb]
Former-commit-id: 9ccf06c4f4
2014-02-18 09:14:38 -06:00
Brian Clements
fa98f1c415 Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: 944a874c5b [formerly d4f3fe7629] [formerly 944a874c5b [formerly d4f3fe7629] [formerly 248db98ddf [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]]
Former-commit-id: 248db98ddf
Former-commit-id: 08bffb26ca [formerly 5faad2ccca]
Former-commit-id: a8dfacc21b
2014-02-18 09:00:21 -06:00
Nate Jensen
72a40614fb Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: 0228d24f1d [formerly e70f0d21ab] [formerly 0228d24f1d [formerly e70f0d21ab] [formerly aa7413fd4c [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]
Former-commit-id: aa7413fd4c
Former-commit-id: c3756326a6 [formerly f1b7bf1c2a]
Former-commit-id: a08dea4b08
2014-02-18 08:48:00 -06:00
Brian Clements
df4c4af7e9 Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: e894019715 [formerly a94b366e26] [formerly e894019715 [formerly a94b366e26] [formerly 3307f5ea5e [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: 02d3a9ae7e [formerly 476d0c3257]
Former-commit-id: 6574733eba
2014-02-17 17:11:36 -06:00
Nate Jensen
0dd9cd1094 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 0160ab0464 [formerly 0c4de50218] [formerly 0160ab0464 [formerly 0c4de50218] [formerly 4d68994525 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 121bcd184a [formerly 228ab8dd60]
Former-commit-id: 944df080f4
2014-02-17 17:10:07 -06:00
Brian Clements
fab5759a01 Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: 6d71686332 [formerly 3b5648c055] [formerly 6d71686332 [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 0d07e417fc [formerly 9dc2967e3f]
Former-commit-id: cd7abc37fc
2014-02-17 16:39:43 -06:00
Bryan Kowal
14488904e5 Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
Amend: add a default value for localization site in the pure overrider.

Change-Id: I6056c274a10def96ba69786b58ba284146e49160

Former-commit-id: bb3a067f93 [formerly f5afe830a7] [formerly bb3a067f93 [formerly f5afe830a7] [formerly e0b0d88e46 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]]
Former-commit-id: e0b0d88e46
Former-commit-id: b5d4574294 [formerly d4ce52459e]
Former-commit-id: f5e65b5e56
2014-02-17 14:41:10 -06:00
Nate Jensen
083a66dc4e Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: 2367c79c1c [formerly 5675869906] [formerly 2367c79c1c [formerly 5675869906] [formerly f4260a617e [formerly ef860082c4cd6159233323b89e0b73e272224f38]]]
Former-commit-id: f4260a617e
Former-commit-id: 1639f43f50 [formerly 96014c806d]
Former-commit-id: e4fb5e0067
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
e0c97ad986 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: 2cf496ca84 [formerly 937b3071d4] [formerly 2cf496ca84 [formerly 937b3071d4] [formerly ca90137801 [formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]]
Former-commit-id: ca90137801
Former-commit-id: fb5b367ecc [formerly 0f6f60a132]
Former-commit-id: 47c3c6845b
2014-02-17 14:02:57 -06:00
Nate Jensen
695d03b815 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: c8e70cd6b1 [formerly 15ff4ab5d7] [formerly c8e70cd6b1 [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]
Former-commit-id: 2486e39192
Former-commit-id: b801b36ca7 [formerly 0314d61773]
Former-commit-id: e6dae7a23c
2014-02-17 11:58:04 -06:00
Nate Jensen
c6b270f084 Issue #2813 fix xml serialization of subscriptions
Former-commit-id: 4583814741 [formerly be75cc3731] [formerly 4583814741 [formerly be75cc3731] [formerly 83e9226419 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]
Former-commit-id: 83e9226419
Former-commit-id: e9bbdfdf89 [formerly 30bbc788ce]
Former-commit-id: 39b3824ae3
2014-02-17 11:37:48 -06:00