xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4978 commits 31 branches 40 tags 3.8 GiB
Commit graph

4978 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Clements
d44c55e976 Issue #2827 fixed collab dataserver returning empty body with 200 
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check


Former-commit-id: 31c42d161146b0367435c66535d4da700a572f24
 2014-03-12 08:27:22 -05:00
Nate Jensen
a1bf3e9874 Merge "Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory. Added a -buildRPM target to build.sh to build a specific RPM." into development 
Former-commit-id: 8d4e32df3a8374e571a3a9d3994e45ea825c418f
 2014-03-11 12:35:53 -05:00
Nate Jensen
4ee98a10cd Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development 
Former-commit-id: 22518ce352166afc70950d631b5df8cbcc063a3d
 2014-03-11 11:30:27 -05:00
Brad Gonzales
48b6c75bb3 Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work 
with openfire 3.9.1.  Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.

Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a

Former-commit-id: 606b269f39ed58e855d9fcba2487fccbaac3c28c
 2014-03-11 11:27:44 -05:00
Dave Hladky
171bb37b0a Issue #2900 Added NWSAuth to import for DD viz feature 
Former-commit-id: 9800d488dfb626c12b8b84f34af06dbbd7d574b0
 2014-03-11 11:04:34 -05:00
Lee Venable
58d7f759b2 Issue #2865 - fixed font memory leak 
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 2555d382f26278c5f972c17da778338142cdaaec
 2014-03-11 10:31:50 -05:00
Ron Anderson
f3a6acaf48 Merge "Issue #2721 Fix error when activeSites.txt contains blank lines." into development 
Former-commit-id: e665fa251dab6afb16d5a3863aac0815e84a00d4
 2014-03-10 18:07:17 -05:00
Ron Anderson
aa62ab0fd8 Issue #2721 Fix error when activeSites.txt contains blank lines. 
Change-Id: I76b9b21134907f5297bae5fb106334ed54f5b6ac

Former-commit-id: d711aa3552e660aba1ac885c0767bab8c856da54
 2014-03-10 17:57:43 -05:00
Ron Anderson
199b6eb3fd Merge "Issue #2824 Fix null at end of validation message." into development 
Former-commit-id: 2b79c54340f7a2bb9492435117db77bb9c6d01a3
 2014-03-10 17:54:51 -05:00
Ron Anderson
f0294a3ff8 Issue #2824 Fix null at end of validation message. 
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: 24ae011033b851364e4c6efe98488c4066cfd042
 2014-03-10 17:42:55 -05:00
Nate Jensen
fb2677db7d Merge "Issue #2848 fixed session create, listen, join ordering" into development 
Former-commit-id: 89427f93a4459a2f5feeac4f9df00db3143eb998
 2014-03-10 17:36:06 -05:00
Steve Harris
cfc9fea413 Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development 
Former-commit-id: 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3
 2014-03-10 16:01:16 -05:00
Ben Steffensmeier
cc8b71fbdf Issue #2867 Better validation of image export frame range. 
Former-commit-id: 6a3a62b913de1d508fb0d470d06a8be4a61918a3
 2014-03-10 15:24:07 -05:00
Ben Steffensmeier
2f75103635 Issue #2791 Add numeric to alertViz feature. 
Former-commit-id: 9918eeec97938cbc7c703738800521773fbb4a87
 2014-03-10 14:55:54 -05:00
Brian Clements
aee98ecfb0 Issue #2848 fixed session create, listen, join ordering 
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: e832f6420b6363a3c951725e0d23f460b2efb42e
 2014-03-10 14:06:45 -05:00
Nate Jensen
873f06e85e Merge "Issue #2673 Fix name of lighning data factory." into development 
Former-commit-id: 5c828c0ddfdf6e29ddfaf706409edda5fb307ade
 2014-03-10 13:53:45 -05:00
Nate Jensen
2570c295d5 Merge "Issue #2832 consolidate watch and warning recycle logic" into development 
Former-commit-id: 4029d0d863bf6da254859028353a271dec70e335
 2014-03-10 13:52:53 -05:00
Ben Steffensmeier
bd7d250cec Issue #2673 Fix name of lighning data factory. 
Former-commit-id: 86e3270b88336978cfa799fae402aa350b6dcac2
 2014-03-10 13:35:34 -05:00
Nate Jensen
8cd98e0b9f Issue #2832 consolidate watch and warning recycle logic 
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889

Former-commit-id: 814d21d0a5b58c95f6339e1816788953692f5e95
 2014-03-10 13:02:45 -05:00
Richard Peter
7a2409f488 Merge "Issue #2876 - removed import, changed jave version to 1.6" into development 
Former-commit-id: 61e13e5e81ee25d4c0be9c80b4e6970f4cf0f3e6
 2014-03-10 12:53:15 -05:00
Mike Duff
419293a946 Issue #2876 - removed import, changed jave version to 1.6 
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29

Former-commit-id: 8ce84ce824a852ad08e70fd272d2bc62b02ef292
 2014-03-10 12:49:27 -05:00
Lee Venable
9bf99b9359 Merge "Issue #2807. Added MalformedDataException for VAA decoding." into development 
Former-commit-id: 4094bd9c9eb40db9a93e679bb09fba1bea1d8639
 2014-03-10 11:52:25 -05:00
Nate Jensen
33d1e94c38 Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development 
Former-commit-id: 99c2f252cab0901cedfefa5e2a6d6799f7e29db8
 2014-03-10 11:36:16 -05:00
Slav Korolev
8f8a6cb90e Issue #2807. Added MalformedDataException for VAA decoding. 
Former-commit-id: 085c10211b1fa397ca54b8d4d316055f9225db0c
 2014-03-10 12:31:57 -04:00
Nate Jensen
d599db4af2 Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: 71a7f485c5a32caeabc98f23164c9fc87cfa1787
 2014-03-10 10:03:02 -05:00
Nate Jensen
14e4807c02 Merge "Issue #2876 - move NDM plugin feature entry." into development 
Former-commit-id: 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88
 2014-03-10 09:49:28 -05:00
Mike Duff
2fc712e1e8 Issue #2876 - move NDM plugin feature entry. 
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

Former-commit-id: a3b334c9269a9753af0f2dd9f6507aef23177b9f
 2014-03-10 09:45:04 -05:00
Nate Jensen
e963c7c4a1 Merge "Issue #2751 ensured that room admins know real userids" into development 
Former-commit-id: e6feac94800c2dd82afcf42ca9f387b24514deff
 2014-03-10 09:15:39 -05:00
Nate Jensen
d04751a986 Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development 
Former-commit-id: 24492229a0bddc3db1b6945fcd2a89a486f1ef2e
 2014-03-10 09:04:51 -05:00
Ben Steffensmeier
8650074737 Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 
Former-commit-id: ba5ff870337c7ac66d633077d84de867e5df967c
 2014-03-07 18:15:32 -06:00
Steve Harris
f60aba35d6 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
 2014-03-07 15:43:40 -06:00
Mike Duff
4cefac4658 Issue #2876 - Fix manifest file. 
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48
 2014-03-07 15:41:24 -06:00
Brian Clements
dc94769c14 Issue #2751 ensured that room admins know real userids 
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: b3bf76b676b7e75559236d67c687cd5011859a8b
 2014-03-07 15:37:29 -06:00
Steve Harris
40b543f9a8 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
 2014-03-07 15:16:18 -06:00
Richard Peter
c9dfa75d1c Merge "Issue #2876 - Pluginize NDM review comments" into development 
Former-commit-id: 296f8f835cbc87783f0f50278d2148f756cf6296
 2014-03-07 13:04:14 -06:00
Mike Duff
c388cb839b Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 2f1aa28a4389c15e20724ebc8d79501c338f565e
 2014-03-07 12:47:46 -06:00
Brian.Dyke
1fe5504d4c Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
 2014-03-07 11:50:06 -05:00
Brian.Dyke
7b798ab5d2 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7
 2014-03-07 09:01:09 -05:00
Brian.Dyke
6414bdab57 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: bb169bc0992f28fe1527cb0106771c35415cea24
 2014-03-07 08:57:07 -05:00
Brian.Dyke
08d8f1a0ee 14.1.1-22 baseline 
Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061
 2014-03-07 08:49:00 -05:00
Steve Harris
1c64a5c025 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
a2e36f4c6c Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
 2014-03-06 18:19:55 -06:00
Nate Jensen
7bfad8ce17 Issue #2826 fix collaboration mosaic image disposed issue 
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: 50b3e6bb7fcee54f1199b78354d404f325b32773
 2014-03-06 18:07:40 -06:00
Brad Gonzales
b47dc5df40 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
dea17a19da 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
68f8cd5ebe Merge "Issue #2756 reworked collaboration dataserver build" into development 
Former-commit-id: bf17d41836aa6444a0efec811fbbb9786c0e36a1
 2014-03-06 16:19:23 -06:00
Ben Steffensmeier
6962f80c5a Issue #2831 Fix No Data Value in collaboration images. 
Former-commit-id: 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c
 2014-03-06 13:37:08 -06:00
Brian Clements
cde0d05820 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
b535c90a23 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
dafe7e6a42 Merge 13.5.3 DR_16824 
Former-commit-id: 1b9ed749da0d1893f44e68400644f37c763e324a
 2014-03-06 11:22:08 -05:00