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

12 commits

Author SHA1 Message Date
Max Schenkelberg
94e64c9b0d Issue Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
 2012-11-07 10:44:42 -06:00
Ben Steffensmeier
c3d732b9dd Issue move alert parsing into the resource data so that it can clear the time cache for derived alerts. 
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8

Former-commit-id: b6e124f830 [formerly 42ae490a50 [formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]
Former-commit-id: 42ae490a50
Former-commit-id: b4d7183cdd
 2012-10-05 14:28:35 -05:00
Nate Jensen
baff86f951 Issue improved use of SimulatedTime 
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: a65e9608fd
Former-commit-id: 6f90bfa61c
 2012-07-31 08:57:54 -05:00
Nate Jensen
903803754a Issue fix auto updates, more efficiently set simulated time 
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: dbe185f3a0 [formerly 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]
Former-commit-id: 3d07fc8ebf
Former-commit-id: ac8d12ce13
 2012-07-26 17:43:29 -05:00
Bryan Kowal
9e7907ecd7 Merge branch '11-Collaboration' into development 
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f528e10391
Former-commit-id: 9361f3eb94
 2012-06-18 11:16:28 -05:00
Ben Steffensmeier
93fe267859 Issue various core changes to make things work smoothly in kml 
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16

Former-commit-id: 58356c49cb [formerly d187436589 [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]
Former-commit-id: d187436589
Former-commit-id: 2c27ec20b5
 2012-06-14 16:41:05 -05:00
Steve Harris
fc70139990 Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

All of these were 'self-resolved' when kdiff3 invoked


Former-commit-id: 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 092efd6072
Former-commit-id: d7f7c26582
 2012-05-09 13:19:47 -05:00
Dave Hladky
37da8763eb Issue Re-wrote SimDate integration for menus, alert observers after 
merge headache.

Former-commit-id: 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 1b7473572f
Former-commit-id: 42a12fa7a5
 2012-04-30 13:43:34 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline 
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
 2012-04-18 15:18:16 -05:00
Ben Steffensmeier
539ebd56d3 Issue Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times. 
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1

Former-commit-id: 9254b762ff [formerly 9cc983549d [formerly 94d4feb2973ed201d369a21126b3443606041179]]
Former-commit-id: 9cc983549d
Former-commit-id: 6194dc8210
 2012-01-30 17:04:47 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync 
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
 2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
 2012-01-06 08:55:05 -06:00