Commit graph

4505 commits

Author SHA1 Message Date
Nate Jensen
09a7251956 Merge "Issue #2712 - improved class merging in Python Overrider. Created PythonOverriderInterface." into development
Former-commit-id: 4487c75c40 [formerly 86b8322391] [formerly 4487c75c40 [formerly 86b8322391] [formerly 517147005f [formerly 17528714e06a31a2397a9b485d4d83fcc91d1bb0]]]
Former-commit-id: 517147005f
Former-commit-id: 66ebd12fbb [formerly 9d848f27e1]
Former-commit-id: 7f407b7efd
2014-01-20 16:09:54 -06:00
Bryan Kowal
744084f871 Issue #2712 - improved class merging in Python Overrider. Created PythonOverriderInterface.
Amend: Wrap ModuleUtil in try..finally to ensure changes to the path are undone
Amend: Fixed formatting in PythonOverriderCore

Change-Id: I8c4d2702ef634d2b038ba20ccffc610db8a6c580

Former-commit-id: db00372029 [formerly c85b151210] [formerly db00372029 [formerly c85b151210] [formerly d2e40770dd [formerly b788b07aecdc4039ef0ce657d7d9a04ab88e0069]]]
Former-commit-id: d2e40770dd
Former-commit-id: 5c5ccfc65d [formerly cf82007019]
Former-commit-id: 29b48d3ef6
2014-01-20 14:02:07 -06:00
Max Schenkelberg
d99c6b49e3 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 1256748c42 [formerly 68aa666045] [formerly 1256748c42 [formerly 68aa666045] [formerly 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 87a6db7853
Former-commit-id: 424f2282f0 [formerly 2574685291]
Former-commit-id: 9903335f77
2014-01-20 13:54:27 -06:00
Ben Steffensmeier
f88b3b7455 Issue #2648 Enhance hprof output for grids and UI activity.
Former-commit-id: 31bbdb3d4d [formerly 91270be4f7] [formerly 31bbdb3d4d [formerly 91270be4f7] [formerly a401c4bed0 [formerly 80e4b1bdff46f8e1c77ba50b696e8bef5e53d51e]]]
Former-commit-id: a401c4bed0
Former-commit-id: eccaf37aee [formerly f4075f5fa5]
Former-commit-id: 911994f3ec
2014-01-20 13:00:54 -06:00
Nate Jensen
47477bc2c1 Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development
Former-commit-id: d6862c2b02 [formerly e2dfdb01b7] [formerly d6862c2b02 [formerly e2dfdb01b7] [formerly 0bf6222d1e [formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]]
Former-commit-id: 0bf6222d1e
Former-commit-id: dcd1906332 [formerly 83c27d7025]
Former-commit-id: b168eff914
2014-01-20 09:23:24 -06:00
Ben Steffensmeier
ce8619b845 Issue #2651 Synchronize ResourceList.removeRsc.
Former-commit-id: 15c08d7209 [formerly a580fc74b7] [formerly 15c08d7209 [formerly a580fc74b7] [formerly d8263b358d [formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]]
Former-commit-id: d8263b358d
Former-commit-id: a4ce57502c [formerly 18437701d9]
Former-commit-id: 72ee36b365
2014-01-17 11:58:00 -06:00
Nate Jensen
588fe6ffa3 Merge "Issue #2313 Image canvas rendering. Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417" into development
Former-commit-id: 1bf74c5919 [formerly a431fa2bd9] [formerly 1bf74c5919 [formerly a431fa2bd9] [formerly 2d5dede634 [formerly f343371577210225865239aef14a40b529de86ad]]]
Former-commit-id: 2d5dede634
Former-commit-id: 4aa2dbfbc5 [formerly 1405fb3376]
Former-commit-id: 0faecb7c6e
2014-01-17 11:36:30 -06:00
Nate Jensen
e378458687 Merge "Issue #2688 improved error logging in pypies repack" into development
Former-commit-id: acf561910d [formerly f9358fff68] [formerly acf561910d [formerly f9358fff68] [formerly 89a932382c [formerly 21d4e9aa49cdd8b97461e214071f67de3129629c]]]
Former-commit-id: 89a932382c
Former-commit-id: 092ac4541a [formerly 98bf99a5f6]
Former-commit-id: 927049db2a
2014-01-17 11:31:46 -06:00
Nate Jensen
40ee467a10 Merge "Issue #2646 Fix Drawing layer NPE." into development
Former-commit-id: 211f7a1bf0 [formerly bad984f103] [formerly 211f7a1bf0 [formerly bad984f103] [formerly f85f54d2ae [formerly c8975c8b00feb8ab5dfa97d8f78bf54ab7290b90]]]
Former-commit-id: f85f54d2ae
Former-commit-id: e8bfb55387 [formerly edc2c700c8]
Former-commit-id: 08ebba2423
2014-01-17 10:50:38 -06:00
Brian Clements
89a4156614 Issue #2688 improved error logging in pypies repack
Former-commit-id: eb3b2b66bf [formerly 5ff2f049d6] [formerly eb3b2b66bf [formerly 5ff2f049d6] [formerly 4b86d19055 [formerly 9b951cb9e28177a9ad702870724c5228c575f284]]]
Former-commit-id: 4b86d19055
Former-commit-id: b91f3828d0 [formerly 6bda60d2a7]
Former-commit-id: 926424bbb6
2014-01-17 10:47:04 -06:00
Ben Steffensmeier
711472433f Issue #2646 Fix Drawing layer NPE.
Former-commit-id: f31f7dc53a [formerly 068a9c6efb] [formerly f31f7dc53a [formerly 068a9c6efb] [formerly 5cbe38aade [formerly 1e5f3e1375ec3d9485863b38e6926e95e7b3921e]]]
Former-commit-id: 5cbe38aade
Former-commit-id: d43a97c51e [formerly e1fe6136ee]
Former-commit-id: 8a1de3a0bd
2014-01-17 10:41:53 -06:00
Nate Jensen
8378b17ed6 Merge "Issue #2620 Removed unused commons.logging project, removed dependency in apache.http build path" into development
Former-commit-id: 00391f8efa [formerly bd5ff9706c] [formerly 00391f8efa [formerly bd5ff9706c] [formerly 4460b719f3 [formerly 85941bce1eda1ef2284e5ce4e3164086b9091125]]]
Former-commit-id: 4460b719f3
Former-commit-id: 0902caecb4 [formerly ce1473df8e]
Former-commit-id: 6b3c175096
2014-01-16 18:27:50 -06:00
Ben Steffensmeier
38024fb662 Issue #2313 Image canvas rendering.
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 76414243ba [formerly 625aac3ed3] [formerly 76414243ba [formerly 625aac3ed3] [formerly 16c350f0c6 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]
Former-commit-id: 16c350f0c6
Former-commit-id: 19930b7c8b [formerly 1973e5e015]
Former-commit-id: af39398ac3
2014-01-16 17:05:16 -06:00
Max Schenkelberg
74125016e0 Issue #2620 Removed unused commons.logging project, removed dependency in apache.http build path
Change-Id: I4c6156080784c5fe9d2f9e9b8f8ea1594b919fb1

Former-commit-id: aad907e0b3 [formerly b2e5968d97] [formerly aad907e0b3 [formerly b2e5968d97] [formerly 65bbc5d6d5 [formerly 02ae43dcc86c7154af5629c20813bb542eb6cd6b]]]
Former-commit-id: 65bbc5d6d5
Former-commit-id: bb03f8707f [formerly 6e1d5b070f]
Former-commit-id: 8b5cb15ad2
2014-01-16 14:50:34 -06:00
Lee Venable
39c7b5dffb Issue #2691 - Fixed null pointer exception when closing MPE perspective.
Former-commit-id: 24a4cafd0c [formerly 8405e235e6] [formerly 24a4cafd0c [formerly 8405e235e6] [formerly b435fd3050 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]
Former-commit-id: b435fd3050
Former-commit-id: a859b50881 [formerly bc07967e3b]
Former-commit-id: a49baddf98
2014-01-16 10:35:12 -06:00
Nate Jensen
5ec7ca620c Merge "Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D. Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69" into development
Former-commit-id: 65306a503e [formerly a71ef7b581] [formerly 65306a503e [formerly a71ef7b581] [formerly 518a3165e4 [formerly 56fd57c3e00926c95ab05297772161e960586e8f]]]
Former-commit-id: 518a3165e4
Former-commit-id: d4db973df1 [formerly 104a0a2de2]
Former-commit-id: 58c1ba12e5
2014-01-16 09:06:10 -06:00
Ben Steffensmeier
6d8adaccb2 Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D.
Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69

Former-commit-id: 8b23f32311 [formerly ee11e5d13c] [formerly 8b23f32311 [formerly ee11e5d13c] [formerly ac33fb9463 [formerly a8bcec4a2fa9ddd49dc300ebd63aebfdfb41723e]]]
Former-commit-id: ac33fb9463
Former-commit-id: b2b2136868 [formerly be163ebf2a]
Former-commit-id: 182a717b00
2014-01-16 09:03:50 -06:00
Nate Jensen
51df7b69cc Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: 8420f87348 [formerly bdb4d8bdeb] [formerly 8420f87348 [formerly bdb4d8bdeb] [formerly eafe61cd37 [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]
Former-commit-id: eafe61cd37
Former-commit-id: 5504ec1efd [formerly 46dfbe9334]
Former-commit-id: b7a74dcb74
2014-01-15 13:48:13 -06:00
Brian Clements
72b75a821d Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: 7e952c5ba8 [formerly 24190efb75] [formerly 7e952c5ba8 [formerly 24190efb75] [formerly 57fb953b8d [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]
Former-commit-id: 57fb953b8d
Former-commit-id: 7410c36783 [formerly 53273c4e5a]
Former-commit-id: 07b9ab8b7b
2014-01-15 13:20:25 -06:00
Nate Jensen
63873e2850 Merge "Issue #2608 quartz components use single scheduler" into development
Former-commit-id: 8a493724b4 [formerly 0cb8624fbf] [formerly 8a493724b4 [formerly 0cb8624fbf] [formerly 9d29114c98 [formerly 92dabc6a9f0139508cd1cbca7aac3aacc2ee2f2d]]]
Former-commit-id: 9d29114c98
Former-commit-id: bcee7fbe17 [formerly 7cf296e8e4]
Former-commit-id: c801dbe45c
2014-01-15 13:05:44 -06:00
Brian Clements
67e65db850 Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: 45b5df24d4 [formerly 79446d983b] [formerly 45b5df24d4 [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: bfbcbf382a [formerly 1219713128]
Former-commit-id: 7afcf37c11
2014-01-15 10:24:09 -06:00
Nate Jensen
4324ca4d76 Merge "Issue #2667 make exception of not handling data type the norm, so that not every data type has to override those methods." into development
Former-commit-id: 02b156960a [formerly 2251876406] [formerly 02b156960a [formerly 2251876406] [formerly ef50b4aef6 [formerly 1d654323f1ac27068d879746da74c6e71aec1975]]]
Former-commit-id: ef50b4aef6
Former-commit-id: 30ce7390b1 [formerly 4326304651]
Former-commit-id: 20f3325c4a
2014-01-14 17:53:12 -06:00
Matt Nash
b88b34c183 Issue #2667 make exception of not handling data type the norm, so that not every data type has to override those methods.
Change-Id: I68072bead09f153f0b6b8c459822c4924a0a0988

Former-commit-id: 52345c0335 [formerly 996706b719] [formerly 52345c0335 [formerly 996706b719] [formerly 93c132b630 [formerly a067b0017d2f214d3ca3a866be69d74816351baa]]]
Former-commit-id: 93c132b630
Former-commit-id: c358e740e6 [formerly 5c1213e125]
Former-commit-id: 4e66e9fec2
2014-01-14 17:16:19 -06:00
Brian Clements
db92ac5b84 Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files


Former-commit-id: c63c8e2fc6 [formerly f9a8b68da5] [formerly c63c8e2fc6 [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: 496d15d77f [formerly e420ae009d]
Former-commit-id: dd0c5d9b57
2014-01-14 17:05:28 -06:00
Brian Clements
b18c7dcee6 Issue #2608 quartz components use single scheduler
configured quartz components to use a single scheduler
added workaround to camel limitation which requires management name set on context
added quartz properties file copied from the quartz jar (can be used to set thread count)


Former-commit-id: f1c3efdd0e [formerly 3959c9e023] [formerly f1c3efdd0e [formerly 3959c9e023] [formerly 1a5991dcf5 [formerly 2b16524026b3c8834e5846f8cd800ae4e1a95e07]]]
Former-commit-id: 1a5991dcf5
Former-commit-id: 1708f1c350 [formerly f0b260d1ce]
Former-commit-id: d62dd50b7b
2014-01-14 08:43:21 -06:00
Brian Clements
c934358ccc Issue #2594 disabled LATLON grid interpolation
Former-commit-id: deac151bc9 [formerly f8820538f4] [formerly deac151bc9 [formerly f8820538f4] [formerly 5a3ed14237 [formerly 4840da51dcb7b9366417129663c0e539716f2335]]]
Former-commit-id: 5a3ed14237
Former-commit-id: 330e961490 [formerly 7efb35be30]
Former-commit-id: 15308ca1b9
2014-01-13 17:44:49 -06:00
Nate Jensen
8c3f85a6b1 Merge "Issue #2594 made heap status monitor default on launch" into development
Former-commit-id: 8d4d024617 [formerly 542bbd88bc] [formerly 8d4d024617 [formerly 542bbd88bc] [formerly 09082cc89e [formerly 0907626a01c547a49d89d6cf15f479271dd0e0fe]]]
Former-commit-id: 09082cc89e
Former-commit-id: 86d6e78d17 [formerly 4d6bb9a75d]
Former-commit-id: 9c0c12ed9a
2014-01-13 13:01:29 -06:00
Nate Jensen
54be083160 Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
Former-commit-id: 02f7b23f72 [formerly aba4acf355] [formerly 02f7b23f72 [formerly aba4acf355] [formerly bd44fec4eb [formerly 2c9ce82cec838ac27153cfa1227b7bf787c1964b]]]
Former-commit-id: bd44fec4eb
Former-commit-id: 4b9411854e [formerly 708c77878f]
Former-commit-id: 58a14c506b
2014-01-13 09:33:26 -06:00
Brian Clements
c3e6c9501d Issue #2594 made heap status monitor default on launch
Former-commit-id: 4f37164fc5 [formerly 6ba1eb0edb] [formerly 4f37164fc5 [formerly 6ba1eb0edb] [formerly 4a62eb90dc [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: cde78c4006 [formerly 3d196a00dd]
Former-commit-id: 5ab028fbe4
2014-01-10 14:54:14 -06:00
Nate Jensen
900f5a8b3b Merge "Issue #2647 Fix window focus problems." into development
Former-commit-id: 95181d092e [formerly 5e1dfbf0f8] [formerly 95181d092e [formerly 5e1dfbf0f8] [formerly 2a06693b3e [formerly 3d586d2e95877c79bdaa88080d920ce12c1dd5c4]]]
Former-commit-id: 2a06693b3e
Former-commit-id: d41877f6fe [formerly 7ad41f6958]
Former-commit-id: 38c95850f0
2014-01-10 11:14:53 -06:00
Max Schenkelberg
38d14b6ad6 Issue #2620 Reordered developer feature.xml to match p2-build.xml
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67

Former-commit-id: 13172879fd [formerly ae7eb39380] [formerly 13172879fd [formerly ae7eb39380] [formerly 73c022da20 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]
Former-commit-id: 73c022da20
Former-commit-id: 59586b673b [formerly 8abc1ec611]
Former-commit-id: 20ba02a238
2014-01-10 10:39:07 -06:00
Nate Jensen
aa413ac32b Merge "Issue #1998 fixed NPE in PointDataPluginDao" into development
Former-commit-id: 41a20fbd00 [formerly 21114964fa] [formerly 41a20fbd00 [formerly 21114964fa] [formerly 32909203d0 [formerly a04a5427256f18725d85da15497d9637419c885c]]]
Former-commit-id: 32909203d0
Former-commit-id: 9e696b1257 [formerly 30d01ec8ba]
Former-commit-id: 4ea65f0904
2014-01-10 08:58:03 -06:00
Ben Steffensmeier
4bc9ead269 Issue #2647 Fix window focus problems.
Former-commit-id: 13da8899de [formerly 2b9e9a41db] [formerly 13da8899de [formerly 2b9e9a41db] [formerly 488d5e45b1 [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 1aa018e5b7 [formerly 0ada0c6d3f]
Former-commit-id: 403ba78a15
2014-01-09 15:14:38 -06:00
Brian Clements
ea9296958c Issue #1998 fixed NPE in PointDataPluginDao
StorageStatus was not being checked after operation


Former-commit-id: f0c1b109f8 [formerly 401cd813f1] [formerly f0c1b109f8 [formerly 401cd813f1] [formerly 1e6ae5a98e [formerly 82736d581767831f426a17b0ee9d264fdda7dd64]]]
Former-commit-id: 1e6ae5a98e
Former-commit-id: 6baf80fc5c [formerly 25765f2fb6]
Former-commit-id: 7d4cfb14a5
2014-01-09 14:02:52 -06:00
Nate Jensen
0b507a19c9 Merge "Issue #2563 added user server add/remove functionality" into development
Former-commit-id: f7adb31fc5 [formerly 7d0fc33055] [formerly f7adb31fc5 [formerly 7d0fc33055] [formerly 6fdf4361f8 [formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: aeffb73883 [formerly 0351c26443]
Former-commit-id: 9103dabf43
2014-01-09 13:44:24 -06:00
Brian Clements
542e01f322 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: af9292ea71 [formerly 487aa58778] [formerly af9292ea71 [formerly 487aa58778] [formerly c8cfc788f3 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a8f746f794 [formerly 0c5b0eaf69]
Former-commit-id: 30521ee989
2014-01-09 13:19:59 -06:00
Max Schenkelberg
2e9ff4982a Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b

Former-commit-id: 5d488d27b9 [formerly 83c600ada9] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]
Former-commit-id: f4765d1577
Former-commit-id: f10dcc6de3 [formerly e4de3defec]
Former-commit-id: 645bb6981e
2014-01-09 11:26:19 -06:00
Ben Steffensmeier
909594029e Issue #2648 Hprof analysis utility.
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68

Former-commit-id: 51a7dfb438 [formerly de58f318cb] [formerly 51a7dfb438 [formerly de58f318cb] [formerly 30ac7d37a5 [formerly 1bfc1a31ed9052795e1ab0e83cd4bede3eb8e17c]]]
Former-commit-id: 30ac7d37a5
Former-commit-id: 76561f48b8 [formerly 3f7a5c135f]
Former-commit-id: 00ed5a277c
2014-01-08 16:47:03 -06:00
Nate Jensen
cf5ca32b8a Merge "Issue #2563 fixed room id creation" into development
Former-commit-id: 537dc6c8cc [formerly cbad156c05] [formerly 537dc6c8cc [formerly cbad156c05] [formerly a8e9db0dde [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 432a89c0fc [formerly 5beb950218]
Former-commit-id: 93e15999b3
2014-01-07 13:50:41 -06:00
Brian Clements
7da97f676f Issue #2563 fixed room id creation
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself


Former-commit-id: a78b1d96af [formerly 82716fa147] [formerly a78b1d96af [formerly 82716fa147] [formerly 66df912a4e [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]
Former-commit-id: 66df912a4e
Former-commit-id: 12c7371565 [formerly 649483d3fd]
Former-commit-id: 33b9ecb2ab
2014-01-07 13:04:24 -06:00
Nate Jensen
be8247e7ae Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 26f37a2fd4 [formerly 92e1df8856] [formerly 26f37a2fd4 [formerly 92e1df8856] [formerly 87876790f8 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]
Former-commit-id: 87876790f8
Former-commit-id: 527e0197be [formerly 365c11c9db]
Former-commit-id: 3606a4fdcf
2014-01-07 12:39:46 -06:00
Nate Jensen
9dbab11fae Merge "Issue #2563 added packet extension to openfire plugin" into development
Former-commit-id: a60bbdc647 [formerly 5846b324f3] [formerly a60bbdc647 [formerly 5846b324f3] [formerly dae995730e [formerly 343de55a9a845657304d72779ee1d4aec46ed678]]]
Former-commit-id: dae995730e
Former-commit-id: 2ae6fdba34 [formerly ff62284a75]
Former-commit-id: 100b29fc76
2014-01-07 11:17:04 -06:00
Brian Clements
426bb7b944 Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: e08c5ea04c [formerly e263cdb63a] [formerly e08c5ea04c [formerly e263cdb63a] [formerly dfcf6e9ade [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 373feec7f5 [formerly 27b4ec6df6]
Former-commit-id: 22f322d887
2014-01-07 10:52:50 -06:00
Slav Korolev
4c3ce254b6 Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 5bbb774073 [formerly 714fd018ef] [formerly 5bbb774073 [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]
Former-commit-id: ab7fc816b4
Former-commit-id: eb5ec35275 [formerly 0fb9810e91]
Former-commit-id: 4fd070dd46
2014-01-07 11:48:13 -05:00
Brian Clements
55467fe96e Issue #2563 added packet extension to openfire plugin
openfire plugin now sends configuration in packet extension
legacy method of putting config in chat message still supported by default
added configuration to web gui to toggle legacy message method


Former-commit-id: 04e7c2f749 [formerly 2e53fcbccb] [formerly 04e7c2f749 [formerly 2e53fcbccb] [formerly a2c709fb34 [formerly a26eeaae28de6e41fdc49a2b75ad6814ece478cd]]]
Former-commit-id: a2c709fb34
Former-commit-id: b366f38199 [formerly b42d2f5528]
Former-commit-id: d028af1800
2014-01-07 10:33:37 -06:00
Nate Jensen
0f7a533d73 Merge "Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins." into development
Former-commit-id: 6969518530 [formerly 6c5b954cf1] [formerly 6969518530 [formerly 6c5b954cf1] [formerly 23b4da6615 [formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]
Former-commit-id: 23b4da6615
Former-commit-id: 1568132e22 [formerly 72e77fc4b1]
Former-commit-id: 9e7c5fc54a
2014-01-07 08:46:02 -06:00
Max Schenkelberg
783391423f Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: b3aed99142 [formerly 16046a4dde] [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: 0ceaa43902 [formerly f58795f460]
Former-commit-id: 789a279475
2014-01-06 17:03:45 -06:00
Brian Clements
dd6fd2532c Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 4f2aa49807 [formerly cea12a1a1d] [formerly 4f2aa49807 [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]
Former-commit-id: b01e6f0c98
Former-commit-id: 74c6fdc613 [formerly d64d95d0c6]
Former-commit-id: 37be43af82
2014-01-06 14:14:38 -06:00
Brian Clements
73a3213cd1 Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0ce560149e [formerly 73347283b6] [formerly 0ce560149e [formerly 73347283b6] [formerly d07bc465d4 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4
Former-commit-id: 5dcaa98110 [formerly 0f4be44a23]
Former-commit-id: 70d4484473
2013-12-20 14:40:00 -06:00
Brian Clements
41f6c010af Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b120d74099 [formerly 2b8668a4eb] [formerly b120d74099 [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 0882672686 [formerly 4b4c7ba50c]
Former-commit-id: 98fd3e6a4c
2013-12-20 12:03:04 -06:00