Commit graph

4051 commits

Author SHA1 Message Date
Bryan Kowal
38c4f03c0a Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 18a3f63616 [formerly 4e3c577c56] [formerly 32f3e63bd5] [formerly 382cb87fa3 [formerly 32f3e63bd5 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]
Former-commit-id: 382cb87fa3
Former-commit-id: bd8c04417fd168b2227cc23f892d33fc380013fa [formerly 50ab20be95]
Former-commit-id: 6a129d3a96
2013-08-15 15:40:05 -05:00
Bryan Kowal
2a9f4d41c9 Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 23fb13a41c [formerly 7d7511af9b] [formerly 19d80d96c3] [formerly c0458d512d [formerly 19d80d96c3 [formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]
Former-commit-id: c0458d512d
Former-commit-id: b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3]
Former-commit-id: f68943aeef
2013-08-15 15:39:37 -05:00
Bryan Kowal
5ccd628305 Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: 31ee9b4bdc [formerly a962be9a15] [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]
Former-commit-id: 8b51e353f1
Former-commit-id: b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c]
Former-commit-id: 9943f3a57c
2013-08-15 15:38:11 -05:00
Bryan Kowal
33b6f03899 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]
Former-commit-id: 94eacfc460
Former-commit-id: b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]
Former-commit-id: 53124c5e02
2013-08-15 15:30:05 -05:00
Bryan Kowal
45ab6afc31 Issue #2163 - additional RHEL6 changes
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: 6e76fc6624 [formerly 5feab7c0be] [formerly bbca63a8b8] [formerly 36eca9bbfb [formerly bbca63a8b8 [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]]
Former-commit-id: 36eca9bbfb
Former-commit-id: be9ce96e1e14d369e98c21317e7f54a4d7d48430 [formerly 1f5e92aac9]
Former-commit-id: 9b62e39fff
2013-08-15 15:25:52 -05:00
Bryan Kowal
b177c46971 Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
Former-commit-id: 37ebd41ee0 [formerly 1c2ca11a33] [formerly b08a9da804] [formerly b1e4e77a13 [formerly b08a9da804 [formerly 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b]]]
Former-commit-id: b1e4e77a13
Former-commit-id: 290da1b6c7cb0a4e7ce8b2b679428c5b1cd6adc2 [formerly c97d4f42b6]
Former-commit-id: a5effbed37
2013-08-15 15:25:43 -05:00
Bryan Kowal
b1bf843307 Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
- httpd has been updated for compatibility


Former-commit-id: 3074681a82 [formerly d3f5a8ecfd] [formerly 91a84e57b5] [formerly c0614bc7d4 [formerly 91a84e57b5 [formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]]
Former-commit-id: c0614bc7d4
Former-commit-id: c5c75095cdb39d40899d94cb78da35c31632b661 [formerly ba04336262]
Former-commit-id: 68c89e6736
2013-08-15 15:25:02 -05:00
Bryan Kowal
d30c098382 Issue #2163 - 64-bit RHEL6 rpm conversion
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries


Former-commit-id: 35478ce5ff [formerly b32922186d] [formerly 0bee225031] [formerly e686f9bdda [formerly 0bee225031 [formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]]
Former-commit-id: e686f9bdda
Former-commit-id: d66458a6e3e011df4ee392929eae99b13093533d [formerly e24b249d5b]
Former-commit-id: 8d4645a0a4
2013-08-15 15:24:48 -05:00
Bryan Kowal
5185e79785 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: 61b14897fd [formerly 2b4faafed7] [formerly e3e596eb5d] [formerly be011d3b92 [formerly e3e596eb5d [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]]
Former-commit-id: be011d3b92
Former-commit-id: 475cbcc55e42aa6fa76623a7fa80a66662613073 [formerly 7b1615ba80]
Former-commit-id: 6561efe457
2013-08-15 15:24:11 -05:00
Brad Gonzales
32a2f9cff4 Issue #2196 final name change for registries. Now registry and centralRegistry.
Change-Id: I172aa9918c2281fa2923503eeb067954e4bf955f

Former-commit-id: 7cf7c73053 [formerly 18956d5816] [formerly 2279d03112] [formerly 705d4660cc [formerly 2279d03112 [formerly f5a61ca98bc2da6bb69ef6f78fe40e390bfab45f]]]
Former-commit-id: 705d4660cc
Former-commit-id: 8eaf9ba357094cfe61c11d3c50bbdda77fcde437 [formerly cf77bb12b7]
Former-commit-id: 48cc348080
2013-08-15 14:57:53 -05:00
Bryan Kowal
f2f9b319a2 Issue #2257 - edexBridge now uses qpid 0.18 (64-bit)
- Amend: updated for 32-bit
- Amend: close sender, session, and connection independently

Change-Id: I9b8cafbc10d81782a812e9d2d57930e859fa29a5

Former-commit-id: fac61175b6 [formerly 14fc0aba77] [formerly da29ff63f4] [formerly 431dbaeaac [formerly da29ff63f4 [formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]]
Former-commit-id: 431dbaeaac
Former-commit-id: b2c86076a9640772277bd4127df600a8866f4e44 [formerly 7c3c19f794]
Former-commit-id: 00c47b4f24
2013-08-15 14:30:55 -05:00
Mike Duff
f84671f284 Issue #2143 - Fix various issues with SCAN/DMD/TVS
Change-Id: Ice9a0f13881c31ca1d51f2f2158f74caa064f1f8

Former-commit-id: 71d725ae07 [formerly e31a6c3426] [formerly c871d6a1cd] [formerly 640a154647 [formerly c871d6a1cd [formerly 0d5a35fcaac31c594ae7e5abda889e75a772c352]]]
Former-commit-id: 640a154647
Former-commit-id: b69387bbc5be20457dc6bf7e7e6e921b75d8fabc [formerly 03b3b3860a]
Former-commit-id: 136a98785b
2013-08-15 14:14:07 -05:00
Max Schenkelberg
43fc7e0b43 Issue #2189 Added a FontType option when initializing a font from a file.
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Former-commit-id: 59f3945002 [formerly b07ed474e3] [formerly eab65aab5a] [formerly 570266eb7b [formerly eab65aab5a [formerly 473421a32f7c53453db1c5331714204a89bad4da]]]
Former-commit-id: 570266eb7b
Former-commit-id: 3b2d7d1617ff2d360cb22f44c042b38c9fe3c5e3 [formerly 5840d99a95]
Former-commit-id: 72fbe0208e
2013-08-15 13:51:07 -05:00
David Gillingham
be64302011 Issue #2262: Fix ImportError and misnamed method in meteolib.py.
Change-Id: Ic6eb7de7b8c5b6ff7fbd989a43d00c97ea688364

Former-commit-id: d43d6506fa [formerly a8868c5beb] [formerly 8ef34db798] [formerly 953fc192a1 [formerly 8ef34db798 [formerly b61065e473c5f783ebe3cfd603a9e7bd91b63a11]]]
Former-commit-id: 953fc192a1
Former-commit-id: 502cb37326055c452bc1b35e8e9edab2d5e952b0 [formerly a4ed28a384]
Former-commit-id: afbb147ef6
2013-08-15 13:14:39 -05:00
Steve Harris
1c79df1f15 Merge branch 'omaha_13.5.1' into omaha_13.5.2
Former-commit-id: b9fbfe4b48 [formerly dfee8ca5d9] [formerly 67f7a8db62] [formerly 282577d168 [formerly 67f7a8db62 [formerly cfd93a48150e8c559622e806e98362a51f19aee0]]]
Former-commit-id: 282577d168
Former-commit-id: 458c6230be297d0d6293dff70ec0b5b8c49bc0db [formerly 877d672852]
Former-commit-id: 1b31d1d62f
2013-08-15 12:55:24 -05:00
Steve Harris
aba7f09b15 Merge branch 'omaha_13.5.1' (13.5.1-16) into development
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	nativeLib/edex_com/.cproject

Former-commit-id: 56416708fc [formerly 3f8cc1daf3] [formerly 8484f03bb8] [formerly 891f00d650 [formerly 8484f03bb8 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]
Former-commit-id: 891f00d650
Former-commit-id: 39e71fd5cc358e2f7e3567f0928d250b71241a87 [formerly 44251fd949]
Former-commit-id: 2681f1f045
2013-08-15 12:50:08 -05:00
Steve Harris
27a5acb143 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 8f0b0c1514 [formerly 08b105a492] [formerly 727eba03b9] [formerly a687da6075 [formerly 727eba03b9 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: d74946ee629b4883a0e073d9f37dae4d8ca4ed97 [formerly 522867f068]
Former-commit-id: e5c50ad0b6
2013-08-15 12:46:48 -05:00
Steve Harris
ca5796e082 13.5.1-16 baseline
Former-commit-id: 47130c98a5 [formerly 6818d80085] [formerly 34ed84336297f15bcf09076786d608ada5df2472 [formerly cd3b63d961]] [formerly 7ce0234d76 [formerly cd3b63d961 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900]
Former-commit-id: e881ff6271
2013-08-15 13:40:37 -04:00
Max Schenkelberg
62f4f1bafb Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: db24201469 [formerly bbad83c21a] [formerly 6f60751ec6] [formerly c5575f9624 [formerly 6f60751ec6 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]
Former-commit-id: c5575f9624
Former-commit-id: 33159773a1764cd4fb517d13a3cff0a11feaa433 [formerly 8de539020d]
Former-commit-id: 8139e0dfb7
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
15a295ca05 Issue #2259 fix units for goes point data pressure
Former-commit-id: 91df4581d2 [formerly d3628766b8] [formerly 2171c10e9e] [formerly 984c5f2684 [formerly 2171c10e9e [formerly 411c30dc9a5396ade5af03294cad612472e8060b]]]
Former-commit-id: 984c5f2684
Former-commit-id: 430e4cc00c7532c4d09b1b5178c1c9a413e1a952 [formerly fff0ce30ae]
Former-commit-id: 7070a2bd18
2013-08-15 12:02:24 -05:00
David Gillingham
218ec39696 Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
Java. Convert to use of these new methods where possible. Create unit tests.

Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d

Former-commit-id: bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2]
Former-commit-id: 9c656c28b9
2013-08-15 11:30:45 -05:00
Jonathan Sanchez
93efe34bc1 Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly bc30396b63 [formerly 2b849d7003 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]
Former-commit-id: bc30396b63
Former-commit-id: 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca]
Former-commit-id: 19853a4b57
2013-08-15 10:56:37 -05:00
Ron Anderson
afcfafb027 Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
Former-commit-id: d70ba1184d [formerly 5afcf8bee2] [formerly 2b491f11ad] [formerly ca560e5fc0 [formerly 2b491f11ad [formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]]
Former-commit-id: ca560e5fc0
Former-commit-id: 721ef25321b96666b7f8c0e38c59a7d3b652d02c [formerly 86b10cfd4b]
Former-commit-id: 7924115bbc
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
6b5e7b465b Issue #1133 Better error handling for invalid polygons in map resource.
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442

Former-commit-id: b887dcbe6d [formerly aa08c8af42] [formerly 27594e6808] [formerly 7f9bbf3d52 [formerly 27594e6808 [formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]]
Former-commit-id: 7f9bbf3d52
Former-commit-id: 2620f59e4670bcb1f4adcdc1ccc3ccf9e49ea0f2 [formerly 5b51795a18]
Former-commit-id: b970d2ffbb
2013-08-15 10:32:28 -05:00
Brad Gonzales
278d98e214 Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
       and other recommendations from peer review.  Removed count attribute
       from RegistryStatisticsEvent.  Changed construction of SubsriptionRequestEvents
       to set numRecords attribute.

Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2

Former-commit-id: edbea8c515 [formerly e4251ad380] [formerly d2dac35b65] [formerly 64c6e5abff [formerly d2dac35b65 [formerly 818688266a32feec2081f0c6e74a37e431df9435]]]
Former-commit-id: 64c6e5abff
Former-commit-id: 974ed273b70311d9cd1f9f764733500330fab491 [formerly 84e14a5a62]
Former-commit-id: fa4e8d9897
2013-08-15 09:35:10 -05:00
Richard Peter
24f8756c64 Issue #2214: Fix merge issue with gfe-spring.xml
Former-commit-id: e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly dad1b6fb45 [formerly eb8805e51c [formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]
Former-commit-id: dad1b6fb45
Former-commit-id: cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430]
Former-commit-id: bbe1002d2d
2013-08-14 18:32:39 -05:00
David Gillingham
f886d99f18 Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: bbd1a39f37 [formerly 8faf78d220] [formerly 2d6c6cdd39] [formerly 17a45cafe5 [formerly 2d6c6cdd39 [formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]]
Former-commit-id: 17a45cafe5
Former-commit-id: 691b2f8318eef69e3a7cb2bcf7eb3a7e6249393b [formerly db0d0374b0]
Former-commit-id: 64d4ecca53
2013-08-14 17:13:58 -05:00
David Gillingham
5205fe56a7 Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS
emulator program to support new directory structure and some code cleanup and
refactoring.

Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d

Former-commit-id: 31ae04c92a [formerly 1d3f3da9cc] [formerly 0f4f24beb8] [formerly f8b6ec20c1 [formerly 0f4f24beb8 [formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a]
Former-commit-id: 3af47effc5
2013-08-14 17:10:04 -05:00
Nate Jensen
1e75952565 Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
Former-commit-id: f9af5f041e [formerly bc80d6f7dc] [formerly ce4d54ee5a] [formerly f08d3f4a9d [formerly ce4d54ee5a [formerly 22288cd9249420ffd643e5bb6d1f84bc6eda5326]]]
Former-commit-id: f08d3f4a9d
Former-commit-id: d6069bf8bb695ef3d66acffc9dbfab17426bbf87 [formerly d8812ab5f0]
Former-commit-id: 01f2bcd45c
2013-08-14 15:45:29 -05:00
Richard Peter
309c524817 Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly a5383dbfa4 [formerly 7c03fc955b [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]
Former-commit-id: a5383dbfa4
Former-commit-id: adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7]
Former-commit-id: c8ad0e3317
2013-08-14 15:33:02 -05:00
Richard Peter
84bef1f2ec Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]
Former-commit-id: c0b0eef331
2013-08-14 15:23:18 -05:00
Greg Armendariz
955f75647d Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
Former-commit-id: 0578f67668 [formerly e254c838ea] [formerly f02fef09a2] [formerly edf12d4d4f [formerly f02fef09a2 [formerly ced372967755b611158c213011132a353b72f421]]]
Former-commit-id: edf12d4d4f
Former-commit-id: 2b69fe3f0396919408641e48b2a327350177c289 [formerly e867472bf6]
Former-commit-id: c9980c9d3f
2013-08-14 15:00:26 -05:00
Richard Peter
28a53c8a33 Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080]
Former-commit-id: 3f65eaf74b
2013-08-14 14:29:55 -05:00
Mike Duff
ef2f04aa08 Issue #2254 - Send an email to omaha_awips on unit test failures or errors
Former-commit-id: ff37559dcd [formerly c7a76d191f] [formerly 18f11ce9e0] [formerly 0973d5018c [formerly 18f11ce9e0 [formerly 8e0e4e93a094c60c18b28a5ebc49a8f175e6f373]]]
Former-commit-id: 0973d5018c
Former-commit-id: 0c48d1b505be7fd95e34e1901fb3e14f19a95dde [formerly 6ac90578a1]
Former-commit-id: 1f3becc31e
2013-08-14 14:20:52 -05:00
Richard Peter
bb4f543c8a Merge "Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for. Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode." into development
Former-commit-id: 6c7c5a5b4b [formerly 09e4f4f4da] [formerly bdf3d5a295] [formerly bca32c2e0a [formerly bdf3d5a295 [formerly 3f45f1988372462a7f541b9e76a893b1e2f4e1ae]]]
Former-commit-id: bca32c2e0a
Former-commit-id: 33c6f0656217ce1577fa695c01be18653cbe1953 [formerly 925f6cade4]
Former-commit-id: cc2bc4e366
2013-08-14 13:57:48 -05:00
Nate Jensen
edbd00224d Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
Former-commit-id: 9407a5202a [formerly 3b97de573a] [formerly 9776721a46] [formerly 0947f358b1 [formerly 9776721a46 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]]
Former-commit-id: 0947f358b1
Former-commit-id: 4e7d46f90eefa803d5b1de7984747157dee229fb [formerly b1882e2e42]
Former-commit-id: 49567ae86c
2013-08-14 12:55:15 -05:00
Brad Gonzales
bd8a061ef4 Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.

Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044

Former-commit-id: ec3646def6 [formerly 50a10b3efb] [formerly 533deffd53] [formerly 5d169e4df1 [formerly 533deffd53 [formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]
Former-commit-id: 5d169e4df1
Former-commit-id: 6534d32bcc0af9a21a9c40a2ef91bb08b973dcca [formerly f3bc3d9185]
Former-commit-id: 88fdc1e56b
2013-08-14 12:35:18 -05:00
Richard Peter
8a4e3714c2 Merge "Issue #2224 Bug fixes to pass unit test." into development
Former-commit-id: c489a4e9b2 [formerly a9ef2e7fd3] [formerly 1a3dfd45ab] [formerly 11229d4b51 [formerly 1a3dfd45ab [formerly 0063088d0cffc2e7c6ba12f055184dd85f8820ca]]]
Former-commit-id: 11229d4b51
Former-commit-id: c62c3b2c38e630e4071897d31b680ea252f1d4be [formerly 5eb9ca0e1a]
Former-commit-id: ea0ca8a055
2013-08-14 11:55:17 -05:00
Bryan Kowal
f2b5128ede Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function

Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3

Former-commit-id: 67c9cbf70e [formerly ec0ef7fe80] [formerly fc8c3f540d] [formerly 21893102bb [formerly fc8c3f540d [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]
Former-commit-id: 21893102bb
Former-commit-id: 45802081a28e7bb32c87dfb2c52082cf8ae519fb [formerly c2c9d745af]
Former-commit-id: e76b46487c
2013-08-14 11:21:33 -05:00
Richard Peter
143973d9d0 Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
Former-commit-id: 2169c7ae71 [formerly 72ecb0b995] [formerly cfe449d838] [formerly 045d3cd618 [formerly cfe449d838 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]]
Former-commit-id: 045d3cd618
Former-commit-id: d416d75ca336101c5ae43270118c2986ff81ec92 [formerly 3f456db0f1]
Former-commit-id: f02fc50031
2013-08-14 10:53:53 -05:00
Roger Ferrel
8daa627e56 Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: d3a33f2855 [formerly 81a31214cd] [formerly caa97d7d09] [formerly 87f9cb2fb3 [formerly caa97d7d09 [formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]]
Former-commit-id: 87f9cb2fb3
Former-commit-id: f7dc5f884640b503af95dd11719fbe5689844939 [formerly 5be73428f0]
Former-commit-id: 87ca79b294
2013-08-14 10:25:49 -05:00
Mike Duff
d0df6c3107 Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4

Former-commit-id: 3959e7e9f8 [formerly e319928638] [formerly 097028ec59] [formerly e791617acc [formerly 097028ec59 [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]]
Former-commit-id: e791617acc
Former-commit-id: ba7884d6eb75737a8c3c26d231fc65031b3c02a1 [formerly 081d30db4f]
Former-commit-id: b70b7a0681
2013-08-14 10:13:05 -05:00
Steve Harris
6f1b6d494f 13.5.1-15 baseline
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]
Former-commit-id: 4f9288e7c1
2013-08-14 10:24:26 -04:00
Max Schenkelberg
41cc45e8fc Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 116cd76f43f817c4146cfbf39bb00d7365fdbc12 [formerly 759ff7bcfd]
Former-commit-id: 2fc5af010d
2013-08-14 09:20:28 -05:00
Steve Harris
4e75333155 13.5.1-14 baseline
Former-commit-id: c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f]
Former-commit-id: 9bd983e2fe
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
aafcbe9520 Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb

Former-commit-id: 714982e96f [formerly 52d7862d36] [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly c6b6576f01 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: ea268f1966644425a392151655f4081fa9cf6ad5 [formerly 70bb266da7]
Former-commit-id: 7189057682
2013-08-13 20:47:49 -05:00
Nate Jensen
67d028c561 Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
Former-commit-id: a72d987b2e [formerly a50328f796] [formerly e4a9195477] [formerly c844396230 [formerly e4a9195477 [formerly 5b909886e84f0f6942a06367f223940e4448e315]]]
Former-commit-id: c844396230
Former-commit-id: 9d055ae25b28b02efc2fc1cfa94af89b4bcce17d [formerly ffed8deab6]
Former-commit-id: e3f8c316f2
2013-08-13 17:19:25 -05:00
Nate Jensen
dde8a77452 Issue #2262 create new wxmath plugin seeded by Java derivparam functions
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2

Former-commit-id: 9df41ff246 [formerly 23fe237b7e] [formerly 09872d6713] [formerly 959b50d184 [formerly 09872d6713 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]
Former-commit-id: 959b50d184
Former-commit-id: 51c4ef63ff05fff6b408532bd09a5c1ae80588a3 [formerly 44ef756627]
Former-commit-id: aaee338f5c
2013-08-13 16:59:57 -05:00
Richard Peter
0c915ec5dc Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 4dd1b27e44 [formerly 2b23cb871e] [formerly 6efc27c1b1] [formerly d5130432a8 [formerly 6efc27c1b1 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]
Former-commit-id: d5130432a8
Former-commit-id: 2a26f47bc2eef0af172637a67f611d6028ddb875 [formerly 2fc754b899]
Former-commit-id: e28de494e9
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
3806121231 Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f

Former-commit-id: dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly 49f488a58f [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]
Former-commit-id: 49f488a58f
Former-commit-id: dd476c502c979c6b882524dd8959a4110265b20f [formerly 96c88ad28b]
Former-commit-id: d33332bd58
2013-08-13 16:30:05 -05:00