Mike Duff
1f70eb6704
Issue #2876 - Fix manifest file.
...
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9
Former-commit-id: 4cefac4658618dbec585618dbec5856ace7b364d
2014-03-07 15:41:24 -06:00
Richard Peter
476e85b564
Merge "Issue #2876 - Pluginize NDM review comments" into development
...
Former-commit-id: c9dfa75d1c4568108a3c4568108a3c946c8fcf24
2014-03-07 13:04:14 -06:00
Mike Duff
63937fa7cd
Issue #2876 - Pluginize NDM
...
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: c388cb839b944fca16b8944fca16b87fd9cc40c7
2014-03-07 12:47:46 -06:00
Steve Harris
08dbf1f7ea
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 1c64a5c0258b6263bfbd8b6263bfbddc7d6ceced
2014-03-06 18:31:10 -06:00
Steve Harris
93aa41a34b
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a2e36f4c6c7f1ad89df97f1ad89df93358e8d6ef
2014-03-06 18:19:55 -06:00
Brad Gonzales
5cdaee1f29
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: b47dc5df402e224094ad2e224094addadcd2e10b
2014-03-06 17:35:43 -06:00
Brad Gonzales
885a9567bc
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: dea17a19da0e3dc178720e3dc17872a24cbcfa77
2014-03-06 16:29:37 -06:00
Nate Jensen
ff4e5b8c01
Merge "Issue #2756 reworked collaboration dataserver build" into development
...
Former-commit-id: 68f8cd5ebe911253bf25911253bf255bc5c7cbc7
2014-03-06 16:19:23 -06:00
Ben Steffensmeier
0d05c6135b
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 6962f80c5a82b879005082b8790050c9eb976b65
2014-03-06 13:37:08 -06:00
Brian Clements
a97d1a1fb5
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: cde0d05820fac33a8915fac33a8915acbd4910fe
2014-03-06 11:49:57 -06:00
Brad Gonzales
770f675138
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: b535c90a2308ee82c39a08ee82c39acb89c806c8
2014-03-06 10:38:30 -06:00
Brian.Dyke
b8a4de2bf0
Merge 13.5.3 DR_16824
...
Former-commit-id: dafe7e6a42b8fd0f16edb8fd0f16ed7baa5ee0d5
2014-03-06 11:22:08 -05:00
Brian.Dyke
8c54df9e0c
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 010b7a1df51778d207451778d2074526fe429c4b
2014-03-06 11:04:34 -05:00
Brian.Dyke
e5972b7159
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: cb1b4a7ac52dbac1697d2dbac1697d6313b7af0c
2014-03-06 10:56:44 -05:00
Brian.Dyke
972c2c284b
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fedb274c890fdb274c890fbd81ebd8c2
2014-03-06 10:54:15 -05:00
Nate Jensen
1674fb814c
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: f60fba58b1bc0b6ca067bc0b6ca06701ce4ffeca
2014-03-05 15:44:36 -06:00
Brian Clements
e4d22971bd
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: e1819cd4e2ad3d10074aad3d10074abc8ac5e051
2014-03-05 15:29:27 -06:00
Nate Jensen
451a7fe552
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: a91e941d3ebe9cc9397fbe9cc9397f0d547ab0bf
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
6dc44e895f
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 775c29e77c12ed63619a12ed63619afd34cf3993
2014-03-05 14:57:28 -06:00
Nate Jensen
dcbafebc0d
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: 48fa8f8d1bcf4631f9bfcf4631f9bfae9adefbf7
2014-03-05 14:41:12 -06:00
Mike Duff
ec892bb7a7
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 9c873e6dd9e97e745b61e97e745b6125425a4268
2014-03-05 14:39:55 -06:00
Nate Jensen
d0fd1154d4
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 2eea0b920559dcb3a97d59dcb3a97d54d015cb4f
2014-03-05 14:14:25 -06:00
Max Schenkelberg
1dad35e391
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: b5ed7ac36110bfa59aef10bfa59aef83ac37724e
2014-03-05 13:51:06 -06:00
Mike Duff
a670398424
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 9963324b608c693a5f708c693a5f7014107f0914
2014-03-05 12:02:33 -06:00
Nate Jensen
c65bb2a011
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 308ab7c3147a2a489c777a2a489c7709311b8270
2014-03-05 11:41:05 -06:00
Greg Armendariz
d3fcc8caeb
Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
...
Former-commit-id: d2510ab641a9e861834ba9e861834b7d9cc2361e
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
291d5f55df
Issue #2843 Harden recycle.
...
Former-commit-id: 3cd6b29e7526c1a8e49426c1a8e49422adc336df
2014-03-05 11:16:12 -06:00
Nate Jensen
ee84466b3c
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: 0dc5dfae82c07f2e829dc07f2e829dad7d5a745b
2014-03-05 09:04:10 -06:00
Brian Clements
17661200a1
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: c9906cde88c0e4615967c0e4615967d76dd2a8f6
2014-03-05 09:00:57 -06:00
Lee Venable
3c85140ba0
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 980e21ca5ae71dad9c80e71dad9c80f38afb0976
2014-03-05 08:37:13 -06:00
Richard Peter
2be140c0c4
Merge "Issue #2627 harden static initialization on edex main thread" into development
...
Former-commit-id: 6b08aaf55c7c02ab6b667c02ab6b66fdba3b3099
2014-03-04 17:54:09 -06:00
Nate Jensen
e458ca5c52
Issue #2627 harden static initialization on edex main thread
...
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff
Former-commit-id: 660998ac72b989b7240cb989b7240c99254281af
2014-03-04 17:19:24 -06:00
Brian Clements
2482a58273
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: f44f1212dd7b085f62de7b085f62decd0e1e271a
2014-03-04 16:02:25 -06:00
Nate Jensen
6b4d16b750
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: faf3dbb67067fa21cfd967fa21cfd98ebe236ce9
2014-03-04 13:59:01 -06:00
Benjamin Phillippe
7ad21da089
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 9fd35140f059323be87e59323be87e7bf51d507e
2014-03-04 13:31:41 -06:00
Nate Jensen
41d80f6fce
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: 3c3e483d18e3d211c8d7e3d211c8d7559b1794af
2014-03-04 13:18:16 -06:00
Richard Peter
2b5339e16f
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: f9bd27c061aa8e1a3625aa8e1a36255280398130
2014-03-04 12:54:23 -06:00
Richard Peter
83b99aad5c
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 873fa00facf87a913017f87a913017090829f75e
2014-03-04 12:43:17 -06:00
Nate Jensen
e74b0c2854
Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
...
Former-commit-id: 4547cbcfeaea0248ff96ea0248ff96d0e405aac9
2014-03-04 12:39:13 -06:00
Richard Peter
560d3ea59f
Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
...
Former-commit-id: 4fbb2f0059bd94f6bf99bd94f6bf99650f794329
2014-03-04 12:38:30 -06:00
Richard Peter
f343b87101
Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
...
Former-commit-id: 178bfc0b79bc8b838a41bc8b838a4115c9066986
2014-03-04 12:38:07 -06:00
Nate Jensen
02a7daf658
Issue #2870 log product id when generic packet fails to find
...
corresponding packet class
Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1
Former-commit-id: 6818ea9c23a1caeae552a1caeae552ef05ddc408
2014-03-04 11:52:34 -06:00
Nate Jensen
6389e2fb02
Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
...
Former-commit-id: 9b94434a783afd14e1eb3afd14e1eb92e8393915
2014-03-04 11:42:51 -06:00
Nate Jensen
b0e727938b
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: 7ac7dd5f01f50a2789ddf50a2789dd75611f0631
2014-03-04 10:55:05 -06:00
Nate Jensen
645fec513a
Issue #2813 fix subscription package names
...
Former-commit-id: d7d0803ee90ec866f1d20ec866f1d2af76b58b27
2014-03-04 10:53:58 -06:00
Max Schenkelberg
dbc6cc3fc6
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: cbf8b9249ca01a6d68d0a01a6d68d059434c8a60
2014-03-04 09:23:36 -06:00
Max Schenkelberg
4bcdc9f85b
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: 1854bbb477dbcbd1b560dbcbd1b5606edfb8965f
2014-03-03 17:59:48 -06:00
Bryan Kowal
5ded2afc7b
Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
...
Former-commit-id: 56e79f2179e6ae710871e6ae71087183471b4900
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
2807ec9b07
Issue #2673 Add ability to query only ref times to Data Access Layer.
...
Former-commit-id: 9fcb730858641d4acd15641d4acd152230164e1f
2014-03-03 17:44:11 -06:00
Nate Jensen
b95e0e98b8
Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
...
Former-commit-id: 315b7abf28b9e4d40066b9e4d4006636f5a3e788
2014-03-03 17:25:34 -06:00
