Commit graph

4777 commits

Author SHA1 Message Date
Dave Hladky
62156a1ba5 Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception
Former-commit-id: fd85324076 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]
Former-commit-id: 7399b10778
2014-02-28 11:07:15 -06:00
Lee Venable
b4b6cb655e Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: 72f71bc000 [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]
Former-commit-id: 34191dc3dc
2014-02-25 15:53:14 -06:00
Brad Gonzales
a24cbaf683 Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz.  Updated the component.spec to the new version number.

Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3

Former-commit-id: 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]
Former-commit-id: cf9c22ac99
2014-02-25 14:42:59 -06:00
Slav Korolev
40b4bf6e8e Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 5087a0154d [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]
Former-commit-id: bfa84e65ec
2014-02-25 15:23:22 -05:00
Brian Clements
473fcda0cf Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]
Former-commit-id: 3d365a4cd2
2014-02-25 09:17:36 -06:00
Brian Clements
b9c9be4c4f Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]
Former-commit-id: 386e9cc96a
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
a6bf896593 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]
Former-commit-id: e08d4f77c3
2014-02-21 17:37:19 -06:00
Richard Peter
5937649085 Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
Former-commit-id: e923639fb1 [formerly d76c2325618af08be1f20ebec0b2463a49a9b03f]
Former-commit-id: 58a3aac09d
2014-02-21 11:26:26 -06:00
Nate Jensen
7b1cf570f4 Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
Former-commit-id: 9a3f60a216 [formerly 4399b11d3958de1cf8cce2bc66085aa43efb6519]
Former-commit-id: dd00fd1445
2014-02-20 17:55:35 -06:00
Brad Gonzales
08c4d1afea 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: 12e22752c2 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]
Former-commit-id: bd25ec4cd9
2014-02-20 16:31:16 -06:00
Mike Duff
d90f4495c2 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]
Former-commit-id: a7b1e79d2d
2014-02-20 15:09:10 -06:00
Ron Anderson
d63ad1b1de Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: 6a7e4a147d [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]
Former-commit-id: 6ccf6a56e7
2014-02-20 12:32:31 -06:00
Brian Clements
4b7ba54dc3 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: aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]
Former-commit-id: 89a48c3f6b
2014-02-20 11:50:54 -06:00
Brian Clements
d9ac2c0037 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]
Former-commit-id: ab72938246
2014-02-20 11:10:14 -06:00
Ron Anderson
c07544b904 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: c13942140a [formerly 0729266c3f82eccdbf6835789898291ad34451c4]
Former-commit-id: 6f4a63000d
2014-02-20 09:55:56 -06:00
Ron Anderson
1571b9a8eb Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 6b6aa14e59 [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]
Former-commit-id: 08a1be844d
2014-02-20 09:34:18 -06:00
Nate Jensen
5412b72c57 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]
Former-commit-id: 5856957c57
2014-02-19 17:22:00 -06:00
Nate Jensen
b1e2788958 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]
Former-commit-id: 6e59175ce4
2014-02-19 17:18:24 -06:00
Nate Jensen
8b152a8027 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]
Former-commit-id: f99cf7df47
2014-02-19 16:19:27 -06:00
Ron Anderson
7e7f0abfdc Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]
Former-commit-id: b8c00d8ead
2014-02-19 15:39:56 -06:00
Mike Duff
3100a71f34 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]
Former-commit-id: 95fcee385a
2014-02-19 15:26:14 -06:00
Mike Duff
86fce9d547 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]
Former-commit-id: 183657fb33
2014-02-19 15:20:29 -06:00
Nate Jensen
7099b45023 Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: 4b4cca776f [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]
Former-commit-id: c72e2be969
2014-02-19 14:52:24 -06:00
Lee Venable
9cb8925e51 Merge "Issue #2734 - default time range to 24 hours." into development
Former-commit-id: 8e967e8e59 [formerly 4604b591b1f15621fcf4cd0e93143435cccfe43b]
Former-commit-id: e204b350ee
2014-02-19 12:33:46 -06:00
Ron Anderson
8a41723ba6 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

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

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

Former-commit-id: 19033601bf [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]
Former-commit-id: 0b316f7bd9
2014-02-19 10:23:48 -06:00
Matt Nash
bb10484bd0 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: 2d20e84f6a [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]
Former-commit-id: 1835019567
2014-02-19 10:01:25 -06:00
Brian Clements
bee7cdb71a 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: dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]
Former-commit-id: 3a135b8eac
2014-02-19 08:32:26 -06:00
Lee Venable
d62b4e7621 Merge "Issue #2596 - Add check for null coordinates." into development
Former-commit-id: 6e60748b41 [formerly e3517f5144c386038c4d535d79e62ec02d504f9f]
Former-commit-id: c871e4c872
2014-02-18 18:08:10 -06:00
Nate Jensen
79cbb8d79a Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: 698a4f827d [formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]
Former-commit-id: 713ec598c3
2014-02-18 17:35:39 -06:00
Mike Duff
ecb0d45b24 Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: a6509aad8c [formerly 11f3705080210161e6915309a4aec423b307cce8]
Former-commit-id: 9754f0d8dd
2014-02-18 17:32:32 -06:00
Nate Jensen
a6bb05f2e3 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]
Former-commit-id: b08d96b1e8
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
399e3d3f07 Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: 3e0cba04c0 [formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]
Former-commit-id: e19b4518ef
2014-02-18 13:57:28 -06:00
Lee Venable
8b8c5d2258 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: adec7acc7c [formerly 81d300630a64d9077e5b3a801e722fd10de4119e]
Former-commit-id: d9bccda151
2014-02-18 12:21:30 -06:00
Ron Anderson
33adfffab9 Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
Former-commit-id: a860ff3e6e [formerly ecece1009e1508451569b3d065e30820819a0502]
Former-commit-id: 7ab79d8b3a
2014-02-18 12:12:25 -06:00
Nate Jensen
173c646576 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]
Former-commit-id: b3c45b303c
2014-02-18 11:22:19 -06:00
Brian Clements
510c39713f 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: a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]
Former-commit-id: 7028f7fd4d
2014-02-18 11:11:33 -06:00
Brian Clements
a1d9e40bd4 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: f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]
Former-commit-id: 5b4f1e8288
2014-02-18 10:03:12 -06:00
Brian Clements
5faad2ccca Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: d4f3fe7629 [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]
Former-commit-id: 248db98ddf
2014-02-18 09:00:21 -06:00
Nate Jensen
f1b7bf1c2a Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: e70f0d21ab [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]
Former-commit-id: aa7413fd4c
2014-02-18 08:48:00 -06:00
Brian Clements
476d0c3257 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: a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]
Former-commit-id: 3307f5ea5e
2014-02-17 17:11:36 -06:00
Brian Clements
9dc2967e3f 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: 3b5648c055 [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]
Former-commit-id: 3dfd8fbafb
2014-02-17 16:39:43 -06:00
Bryan Kowal
d4ce52459e 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: f5afe830a7 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]
Former-commit-id: e0b0d88e46
2014-02-17 14:41:10 -06:00
Nate Jensen
96014c806d Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: 5675869906 [formerly ef860082c4cd6159233323b89e0b73e272224f38]
Former-commit-id: f4260a617e
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
0f6f60a132 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: 937b3071d4 [formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]
Former-commit-id: ca90137801
2014-02-17 14:02:57 -06:00
Nate Jensen
996663ccee Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
Former-commit-id: 30632fbd84 [formerly 4778976c7175121841fc9ca69a814daf9d466c6c]
Former-commit-id: 063d85ee22
2014-02-17 11:22:53 -06:00
Max Schenkelberg
91f707537b Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc

Former-commit-id: acad670229 [formerly e0a5ec0a713f06eab93d86671a43334110b60b0c]
Former-commit-id: 6a2a33abe1
2014-02-17 11:07:45 -06:00
Nate Jensen
dbc420e917 Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
Former-commit-id: 723ff23ee9 [formerly 4b48313cb3509bebcfdd79e1df3d746a2d12c6af]
Former-commit-id: f3d107580f
2014-02-14 10:50:38 -06:00
Max Schenkelberg
3571135645 Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: 6309f9b34b [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]
Former-commit-id: c8e93190f2
2014-02-14 10:47:42 -06:00