Commit graph

4934 commits

Author SHA1 Message Date
Mike Duff
618dbec585 Issue #2876 - Fix manifest file.
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48
2014-03-07 15:41:24 -06:00
Richard Peter
4568108a3c Merge "Issue #2876 - Pluginize NDM review comments" into development
Former-commit-id: 296f8f835cbc87783f0f50278d2148f756cf6296
2014-03-07 13:04:14 -06:00
Mike Duff
944fca16b8 Issue #2876 - Pluginize NDM
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 2f1aa28a4389c15e20724ebc8d79501c338f565e
2014-03-07 12:47:46 -06:00
Steve Harris
8b6263bfbd Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 857ae00bea95a7981cb4752c1a7c147d725173e3
2014-03-06 18:31:10 -06:00
Steve Harris
7f1ad89df9 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
2014-03-06 18:19:55 -06:00
Brad Gonzales
2e224094ad Issue #2885 Updated java version in build.properties.p2.
Change-Id: Ifb266696902142ab59977025ae75010540836ed5

Former-commit-id: d1f3c5e508cf268198531a31fd3a91faba0159df
2014-03-06 17:35:43 -06:00
Brad Gonzales
0e3dc17872 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: 6d2a542774db6c37cfc2a65f490ebf618f2e7954
2014-03-06 16:29:37 -06:00
Nate Jensen
911253bf25 Merge "Issue #2756 reworked collaboration dataserver build" into development
Former-commit-id: bf17d41836aa6444a0efec811fbbb9786c0e36a1
2014-03-06 16:19:23 -06:00
Ben Steffensmeier
82b8790050 Issue #2831 Fix No Data Value in collaboration images.
Former-commit-id: 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c
2014-03-06 13:37:08 -06:00
Brian Clements
fac33a8915 Issue #2756 reworked collaboration dataserver build
replaced install ant script with build script that also deploys
new build uses feature explorer, but handles its own compile stage
updated deployment and start script to match new build
added logging level control argument


Former-commit-id: 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e
2014-03-06 11:49:57 -06:00
Brad Gonzales
08ee82c39a Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7.
Amend: changed to use set method.

Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1

Former-commit-id: 5c5eb6f348627f65afc527205c5bc1f7b7463ddb
2014-03-06 10:38:30 -06:00
Brian.Dyke
b8fd0f16ed Merge 13.5.3 DR_16824
Former-commit-id: 1b9ed749da0d1893f44e68400644f37c763e324a
2014-03-06 11:22:08 -05:00
Brian.Dyke
1778d20745 ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 85700a6c632125b5f1d36b37a70767fbd9819142
2014-03-06 11:04:34 -05:00
Brian.Dyke
2dbac1697d ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: c1dc533bf7ee6500da3f6d75699ad7758a39462b
2014-03-06 10:56:44 -05:00
Brian.Dyke
db274c890f ASM #124 - Display GLD360 lightning data
Former-commit-id: 1edba9216beac913f9bd867da9988e213394a396
2014-03-06 10:54:15 -05:00
Nate Jensen
bc0b6ca067 Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
Former-commit-id: 0bc02d3ad06b0c0daddefd9550772c79687edfb7
2014-03-05 15:44:36 -06:00
Brian Clements
ad3d10074a Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: d8f30a7af43faa2fd4ac18769d2313ae6008cfd1
2014-03-05 15:29:27 -06:00
Nate Jensen
be9cc9397f Merge "Issue #2791 Move D2D Grids to direct memory." into development
Former-commit-id: acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
12ed63619a Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 8d8a06be12652349032f15ab1e31d5f23adf0b24
2014-03-05 14:57:28 -06:00
Nate Jensen
cf4631f9bf Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: e6dc5f076bfd4811b2b1cdaf3782a5066e032381
2014-03-05 14:41:12 -06:00
Mike Duff
e97e745b61 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: b087558dce4e19596c93d47e986af50fae806a74
2014-03-05 14:39:55 -06:00
Nate Jensen
59dcb3a97d Merge "Issue #2861 added synchronized blocks where necessary" into development
Former-commit-id: e108aa41bb586593f50970da53109a82d2bb8452
2014-03-05 14:14:25 -06:00
Max Schenkelberg
10bfa59aef Issue #2861 added synchronized blocks where necessary
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811

Former-commit-id: 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede
2014-03-05 13:51:06 -06:00
Mike Duff
8c693a5f70 Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: 168a656194aa3b455f403aa92b290bbbe17d3b45
2014-03-05 12:02:33 -06:00
Nate Jensen
7a2a489c77 Merge "Issue #2843 Harden recycle." into development
Former-commit-id: c36359b0aaa1540f6d941e9445b41ed929a91e14
2014-03-05 11:41:05 -06:00
Greg Armendariz
a9e861834b Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
Former-commit-id: ae3372772795cda39176223231d354d776feb1a3
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
26c1a8e494 Issue #2843 Harden recycle.
Former-commit-id: 364b818dbd055b13fd8d5bb9f40c16f730f30b53
2014-03-05 11:16:12 -06:00
Nate Jensen
c07f2e829d Issue #2627 shorten wrapper arg for retaining failed data
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7

Former-commit-id: 54578116023ebc7a6474a3297d419c2777d31e17
2014-03-05 09:04:10 -06:00
Brian Clements
c0e4615967 Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: 3f7cfbbf1c60cffa0aa31f53b29521b78774042e
2014-03-05 09:00:57 -06:00
Lee Venable
e71dad9c80 Issue #2833 - fixed a widget disposed error.
Former-commit-id: eb3cf0ade9203766a437512b85e55f32108db1e3
2014-03-05 08:37:13 -06:00
Richard Peter
7c02ab6b66 Merge "Issue #2627 harden static initialization on edex main thread" into development
Former-commit-id: 82f20a96a82ef7f047f716662d319e522ee1c394
2014-03-04 17:54:09 -06:00
Nate Jensen
b989b7240c Issue #2627 harden static initialization on edex main thread
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: bb838950a2979703ae6ab8f486fc4460789c3f1b
2014-03-04 17:19:24 -06:00
Brian Clements
7b085f62de Issue #2756 added security toggle to collaboration
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: 1e52606fe709f2cf27f835363ca5ab2bf6ada912
2014-03-04 16:02:25 -06:00
Nate Jensen
67fa21cfd9 Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: 27ce4812affb11b506a21b5cf54c4b74b8c49031
2014-03-04 13:59:01 -06:00
Benjamin Phillippe
59323be87e Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: a265027cacde7690171d30455227c5a843e0d397
2014-03-04 13:31:41 -06:00
Nate Jensen
e3d211c8d7 Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: bb84ca01bb74bc93710ba92fcbdb13b30dc2454e
2014-03-04 13:18:16 -06:00
Richard Peter
aa8e1a3625 Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 26cbe68f0a86660968016da88a4b51d1735e8227
2014-03-04 12:54:23 -06:00
Richard Peter
f87a913017 Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 0b9954f00ca5f5a61a1cd79d094408e43b115abe
2014-03-04 12:43:17 -06:00
Nate Jensen
ea0248ff96 Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
Former-commit-id: 51797cd167b76be2b3ab55b6c7632e0039d7145c
2014-03-04 12:39:13 -06:00
Richard Peter
bd94f6bf99 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
Former-commit-id: 12458982fe4c43a9b61e9194246c80527d02da6d
2014-03-04 12:38:30 -06:00
Richard Peter
bc8b838a41 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
Former-commit-id: 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e
2014-03-04 12:38:07 -06:00
Nate Jensen
a1caeae552 Issue #2870 log product id when generic packet fails to find
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: 0d01b387e454f276d0ebdecfb14ad294b67a55b7
2014-03-04 11:52:34 -06:00
Nate Jensen
3afd14e1eb Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
Former-commit-id: eb07c44098abe7f72b578e24a4a7ea7e92dc655c
2014-03-04 11:42:51 -06:00
Nate Jensen
f50a2789dd Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
Former-commit-id: 788133c5ea1a3005ed309a466e8cafad6db84ce3
2014-03-04 10:55:05 -06:00
Nate Jensen
0ec866f1d2 Issue #2813 fix subscription package names
Former-commit-id: 081b621b5932d77c03117840e887ed7017f1d48b
2014-03-04 10:53:58 -06:00
Max Schenkelberg
a01a6d68d0 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: cc34e3dbebe13ec4f63b7529f5053391135837ef
2014-03-04 09:23:36 -06:00
Max Schenkelberg
dbcbd1b560 Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 51664693bd87df52acdb74d5286b61eeb06b792d
2014-03-03 17:59:48 -06:00
Bryan Kowal
e6ae710871 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
Former-commit-id: a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
641d4acd15 Issue #2673 Add ability to query only ref times to Data Access Layer.
Former-commit-id: 37c406a9945bfb6ccb99d2472b44d649f2ce18d0
2014-03-03 17:44:11 -06:00
Nate Jensen
b9e4d40066 Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
Former-commit-id: 2376124f601e97cf46ee8cb3281c326e178aab4d
2014-03-03 17:25:34 -06:00