Commit graph

60 commits

Author SHA1 Message Date
Greg Armendariz
90c1e9e5ca Omaha #3309 - Remove reference to slf4j-log4j library
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2

Former-commit-id: 1a94ba6471 [formerly f391c4c4a9] [formerly 58f93a0ecf] [formerly 58f93a0ecf [formerly 7764f65707]] [formerly 58158a9e73 [formerly 58f93a0ecf [formerly 7764f65707] [formerly 58158a9e73 [formerly 2b2133b9d38453848c6f014704b7625668bcd980]]]]
Former-commit-id: 58158a9e73
Former-commit-id: 4a36ce3ffb6bbf403f24e05adb15e3c2d227a2c4 [formerly 4da0ef882938a79525fd990f4df125fa4cf0480a] [formerly 91357204db [formerly 0fa9ec49a0]]
Former-commit-id: 91357204db
Former-commit-id: 7b3b30fd88
2014-06-26 11:34:47 -05:00
Steve Harris
6450c3d6ee Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: eece76ad05 [formerly 4d724b6474] [formerly 97843cf58e] [formerly 2fe93936e73a13866662b407cdfdc316228c770e [formerly 97843cf58e [formerly 9213369739]]] [formerly e1c8ad2611 [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 1503533d05a69d55df5729868ed86e74147fcedd [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a] [formerly d7cd0ac02c [formerly 362988b9d7]]
Former-commit-id: d7cd0ac02c
Former-commit-id: 6cc0c35e76
2014-06-16 08:19:12 -05:00
brian.dyke
090b8727ea Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 99a5744b5f [formerly f9cf99e369] [formerly 2c2bb61e95] [formerly 2c2bb61e95 [formerly 95c5dc49c1]] [formerly 03cc2fbbfb [formerly 2c2bb61e95 [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: 857af3fd8ad6799266b1ce17ff1591d0b492620e [formerly 3bc9505e32a1d8fc6fd49b2e6e13c333e4573bb6] [formerly b6623af1f7 [formerly e09bd1d283]]
Former-commit-id: b6623af1f7
Former-commit-id: 0cbd37db4f
2014-05-30 10:09:00 -04:00
Brian Clements
2e0a7b756e Omaha #3152 modified rcm build to deploy logback instead of log4j
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac

Former-commit-id: 568cc4c5cc [formerly edb365530e] [formerly 3b2acfc091] [formerly 097b67f244afacc8b40f021f663b07890ebe1df4 [formerly 3b2acfc091 [formerly c227a54da0]]] [formerly 190e877633 [formerly 3b2acfc091 [formerly c227a54da0] [formerly 190e877633 [formerly d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e]]]]
Former-commit-id: 190e877633
Former-commit-id: 49f5de8afd33cacef1fab6b26dfa10b4408b189c [formerly 20c6492e20b9015c6149c8d09099773ee7d7607a] [formerly eb101fbafd [formerly 16e80de9b4]]
Former-commit-id: eb101fbafd
Former-commit-id: a67277b954
2014-05-28 12:17:39 -05:00
Steve Harris
2ede564cdb Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

Former-commit-id: 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly dc74953978 [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: 0d288d370383d89f0fd9b620c1af2bfa831fc49c [formerly b7d992179f759d29da9804b9ffcafec8048bcefa] [formerly 0e9d0b2ef5 [formerly 713cfeffc7]]
Former-commit-id: 0e9d0b2ef5
Former-commit-id: aa133cc8a3
2014-05-28 09:01:00 -05:00
Daniel.Huffman
ee68a61d90 ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3

Former-commit-id: 0c89a2b11a [formerly 5019e2d171] [formerly 343046c159] [formerly 343046c159 [formerly eab2733238]] [formerly 8326f42ed8 [formerly 343046c159 [formerly eab2733238] [formerly 8326f42ed8 [formerly b3f33a3c49607219a234bede34bd983178151f39]]]]
Former-commit-id: 8326f42ed8
Former-commit-id: 090f351ae654032e96f541a503b51e5fc091152d [formerly 4cfe1fd8c4dca6cc4a10913b48925c9c91e851e2] [formerly 1bd20432a3 [formerly b63c845a2b]]
Former-commit-id: 1bd20432a3
Former-commit-id: f1d7154915
2014-05-27 19:59:53 +00:00
Steve Harris
7bb35319b2 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 3b16bbafb1 [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 71416a84ea07f551a8d4b12b7a5193d78a44f0d8 [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc] [formerly bfa4255eea [formerly 9b98b41cd4]]
Former-commit-id: bfa4255eea
Former-commit-id: 9458ea3648
2014-05-27 14:48:24 -04:00
Brian Clements
67bbcd394b Omaha #3152 switched radar server to use logback instead of log4j
removed unneeded custom rolling file appender
replaced log4j config with logback config


Former-commit-id: d5c098aa7e [formerly 00d3fbad8f] [formerly f84333e1ce] [formerly f84333e1ce [formerly f6e7dffe61]] [formerly 132bd3948d [formerly f84333e1ce [formerly f6e7dffe61] [formerly 132bd3948d [formerly ae91e2e2069f73bc661d0009a5d5c083a9d2a229]]]]
Former-commit-id: 132bd3948d
Former-commit-id: 53f98303027acea2cdb7796938aa5201964bcf5f [formerly 2703a85ab37736c687ec4b4a99e58c9b68e47e13] [formerly e93c91abf6 [formerly b79a9a9e51]]
Former-commit-id: e93c91abf6
Former-commit-id: a33678e3d6
2014-05-27 11:11:12 -05:00
Nate Jensen
512ed128a0 Omaha #3133 remove org.apache.mina from radar server
Change-Id: I62e71f4766cb84c5dfc923a52ae8ced97798a089

Former-commit-id: c2bacaacd6 [formerly 968d4828e3] [formerly 9b9338a23f] [formerly 9b9338a23f [formerly 3de37239b4]] [formerly 4294684ec6 [formerly 9b9338a23f [formerly 3de37239b4] [formerly 4294684ec6 [formerly 8ef634c2c2d45313bcc7c973f101cab445900e24]]]]
Former-commit-id: 4294684ec6
Former-commit-id: 81b6d133a4221531aa9a64c485cdd1c88e6e540b [formerly a876bfde88b3cc0750826541ee7480aed98b314a] [formerly 5da01d7f7e [formerly 40714c9226]]
Former-commit-id: 5da01d7f7e
Former-commit-id: 3e014a1497
2014-05-19 11:50:11 -05:00
David Friedman
1668636171 Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: 75d7f3e42a [formerly 99edfe0a17] [formerly a920c5a5e4] [formerly a920c5a5e4 [formerly c909746e0e]] [formerly a55e851780 [formerly a920c5a5e4 [formerly c909746e0e] [formerly a55e851780 [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]]
Former-commit-id: a55e851780
Former-commit-id: ca2e9532cc17b9a287d8f63275e44f0464a80cb4 [formerly bee35b0f50c15c2acee4d04f32450273a1e35f20] [formerly f8c9026f79 [formerly 101f43d875]]
Former-commit-id: f8c9026f79
Former-commit-id: 57712d2038
2014-05-16 16:40:38 -05:00
David Friedman
53829c16ec ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb

Former-commit-id: 259fd91bf5 [formerly a13190aeb9] [formerly b462660d75] [formerly b462660d75 [formerly caa38ec709]] [formerly eab9a6b6d7 [formerly b462660d75 [formerly caa38ec709] [formerly eab9a6b6d7 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: 4b3799c1d9c5d3a373dc17352b1a0fcc7634387b [formerly 5fa6cc8307089b8f052ac6ad0cfa79f0362dc0ab] [formerly 81abf8e7d9 [formerly 4efaa47d2d]]
Former-commit-id: 81abf8e7d9
Former-commit-id: d06f8def65
2014-05-16 21:38:34 +00:00
David Friedman
cf7c557b47 ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5

Former-commit-id: fd6d69b030 [formerly 39e412aac8] [formerly 404f3af49e] [formerly 404f3af49e [formerly 1503bc4162]] [formerly 3b69a240c8 [formerly 404f3af49e [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]]
Former-commit-id: 3b69a240c8
Former-commit-id: e4fefd422be4ff8fd894fe565e65be7e417f3426 [formerly ab442fed2bdf78f10c432839c809a8791bac6aed] [formerly ff0f8e731f [formerly b62ac936ba]]
Former-commit-id: ff0f8e731f
Former-commit-id: 3a6e887a7c
2014-05-16 21:34:59 +00:00
Richard Peter
a655029277 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly cd51f3fa87 [formerly 3575d6586f]]] [formerly 21ae3b5fcd [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: cba185d0d926f9dea67500ef8d8ab9da489ee4bb [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0] [formerly d65b11d404 [formerly a7ec0bcf66]]
Former-commit-id: d65b11d404
Former-commit-id: 56089894f2
2014-04-11 16:23:09 -05:00
Steve Harris
248459109c Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 4bff39258e [formerly 1dd9192564] [formerly 5efb16fa8b] [formerly 5efb16fa8b [formerly d0aeb854f5]] [formerly 0c2c5ad4bd [formerly 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 49c36ccdd7c47e709711998ff99d0e08642ad435 [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb] [formerly 5d95d594f8 [formerly b5a2d2237f]]
Former-commit-id: 5d95d594f8
Former-commit-id: 016a659753
2014-03-17 15:55:41 -05:00
Brad Gonzales
88556ffdc6 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly dea17a19da [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]
Former-commit-id: dea17a19da
Former-commit-id: e670e0feade57e374fb1c735b6e19bb44c2507cb [formerly f2869efb05c763771e03bc02057aa196d29b6d1a] [formerly 4ba60d8a6f [formerly 78d35d4033]]
Former-commit-id: 4ba60d8a6f
Former-commit-id: 09c083ce1f
2014-03-06 16:29:37 -06:00
David Friedman
4576be93a6 ASM #74 - Fix RadarServer configuration import utility JAR dependency
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: e88dd49d06 [formerly e7def94c5f] [formerly fa849dfefa] [formerly fa849dfefa [formerly 11d0d191fd]] [formerly d08597a0d4 [formerly fa849dfefa [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]]
Former-commit-id: d08597a0d4
Former-commit-id: ddfcc80ebdfc75765aee7fcbd90fcbb1b8420dde [formerly 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a] [formerly 7efff2943c [formerly 591ce333dc]]
Former-commit-id: 7efff2943c
Former-commit-id: 3d09743022
2014-03-06 17:07:23 +00:00
David Friedman
dc0424935d ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 13fb60e29c [formerly 9caca1ee5a] [formerly 24ebf8854c] [formerly 24ebf8854c [formerly 611503cd96]] [formerly 969c50b80f [formerly 24ebf8854c [formerly 611503cd96] [formerly 969c50b80f [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]]]]
Former-commit-id: 969c50b80f
Former-commit-id: 69faa4aa60bed2470a351f117bdf25ab4eb20720 [formerly 77ef332e564a2c699a3b6861f3fd44e198b991d1] [formerly ecae4f3099 [formerly 8591015dfb]]
Former-commit-id: ecae4f3099
Former-commit-id: 50718c4b94
2014-02-03 19:03:50 +00:00
Greg Armendariz
38eead2cba Issue #2754 - Remove commons logging calls
Former-commit-id: 5fd21d524e [formerly 689ca84b3f] [formerly efe8011970] [formerly efe8011970 [formerly fa27142ec2]] [formerly 6ae002cf46 [formerly efe8011970 [formerly fa27142ec2] [formerly 6ae002cf46 [formerly 7458fc7a7d3276fb14d963c92f55c89ced838837]]]]
Former-commit-id: 6ae002cf46
Former-commit-id: f23aed09dce97fad90de1cb961cd9c54de484ab9 [formerly 5cf42a9b3e606e1eccdf9c5c70d6bb76b2ced605] [formerly 9f09293f2e [formerly accf0505a5]]
Former-commit-id: 9f09293f2e
Former-commit-id: 05e48bb7f4
2014-02-03 12:17:30 -06:00
brian.dyke
21a827151b merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly 4a62e83835 [formerly 2294c81a57]] [formerly f10f6d4e8a [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 9043d578b89b573988a90ad05bb77fa0d18398cc [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629] [formerly 621464ac0d [formerly e9e2eb3be0]]
Former-commit-id: 621464ac0d
Former-commit-id: ac37e2ea2e
2014-01-27 15:27:49 -05:00
Max Schenkelberg
96f972a617 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 4adb40e333 [formerly 30059d255c] [formerly b3aed99142] [formerly b3aed99142 [formerly 16046a4dde]] [formerly cc2080449c [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: e16937349bd8e68e34180a13f051ca191ec3a50a [formerly d612c358920d902e7385e86659fc1d050de57dd4] [formerly 0ceaa43902 [formerly f58795f460]]
Former-commit-id: 0ceaa43902
Former-commit-id: 257553461b
2014-01-06 17:03:45 -06:00
David Friedman
cee7206aaa Issue #74
Change-Id: I68539f26778ddea09ad23f4f938122157a6813b1

Former-commit-id: e03160376e [formerly 0eb9282611] [formerly baea134dd9] [formerly baea134dd9 [formerly 53c48228d9]] [formerly 88332356d7 [formerly baea134dd9 [formerly 53c48228d9] [formerly 88332356d7 [formerly f70942c4a5ea08110fa937a184876a9f64ddfb8d]]]]
Former-commit-id: 88332356d7
Former-commit-id: 39960e31d1d451f2496b9fd07bf8cdcee7db81d1 [formerly 69fb8ad726141c1b24cd2910d6717e3def193407] [formerly a23db3e2d8 [formerly 4a75e255a8]]
Former-commit-id: a23db3e2d8
Former-commit-id: 838e6e07a1
2013-12-18 16:37:36 +00:00
Richard Peter
26df6d6e8c Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: bbcdf49b38 [formerly 061fa07147] [formerly 7ba466f5a6] [formerly 7ba466f5a6 [formerly 306bd6fae1]] [formerly 460a7b8b5d [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: e4907f5885a36a91d1b65e6e0a89871cb695adee [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d] [formerly 3f68fc6eed [formerly 59671c1e7d]]
Former-commit-id: 3f68fc6eed
Former-commit-id: 112816a54c
2013-11-12 11:11:36 -06:00
Bryan Kowal
7d6056dd7c Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	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
	cots/edu.uci.ics.crawler4j/.classpath
	cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
	cots/edu.uci.ics.crawler4j/build.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
	edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
	edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
	rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1

Former-commit-id: 9acf6a8c15 [formerly f6b8d99e70] [formerly 3b8ce3fd34] [formerly 3b8ce3fd34 [formerly c3eb4e9af9]] [formerly f1cd2f2e5a [formerly 3b8ce3fd34 [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: aae2270294458776d8c79553bb88ddf84eb0cf92 [formerly 9832b7353c98edff371d73697564b1585403dd75] [formerly 464a8d1001 [formerly 1909193f0c]]
Former-commit-id: 464a8d1001
Former-commit-id: b2fb3cc71b
2013-11-08 14:51:47 -06:00
Richard Peter
447789f1a1 Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.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.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: a43f9b5b32 [formerly 1ba8eb3891] [formerly 25df870b67] [formerly 25df870b67 [formerly fa7d77ae97]] [formerly 93c776022a [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: c13fde9952c4d04bb5a99e02ea658bf020889a28 [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4] [formerly c97efbf656 [formerly 520dd57f02]]
Former-commit-id: c97efbf656
Former-commit-id: aec254aac0
2013-11-07 14:25:45 -06:00
Steve Harris
9e24b1f2db 14.1.1-6 baseline
Former-commit-id: 074a9d0f18 [formerly f44bae4383] [formerly 946a9be17e] [formerly 946a9be17e [formerly 0cb2978c13]] [formerly 6067af4252 [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 0e6c13ff0923d55fc492817e918e7f877d10c7d8 [formerly 70967acd51143f4f43cec1322c400d567f95c3ce] [formerly e86a0aa489 [formerly 26da1ce793]]
Former-commit-id: e86a0aa489
Former-commit-id: 2a5f4c26d6
2013-11-06 14:08:33 -05:00
Steve Harris
6e4187af3c 14.1.1-3 baseline
Former-commit-id: 0cc505a64a [formerly a0ba2e1252] [formerly 851f9df229] [formerly 851f9df229 [formerly 94f24e0d8a]] [formerly 5739b4f832 [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: e5bec8304375023d2850a2bca444926f4925c949 [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19] [formerly aa59400b67 [formerly 4a6a209aea]]
Former-commit-id: aa59400b67
Former-commit-id: 2d30611c6d
2013-10-28 10:46:02 -04:00
Steve Harris
38d7b39899 13.5.2-12 baseline
Former-commit-id: 59dc1c29ae [formerly 845d49e370] [formerly e2b9baf2ed] [formerly e2b9baf2ed [formerly a532896473]] [formerly bcb531e671 [formerly e2b9baf2ed [formerly a532896473] [formerly bcb531e671 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 4ad1774e666d5cd6daf65394e12de3bad5132c64 [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3] [formerly 15d9848170 [formerly b70ec5732d]]
Former-commit-id: 15d9848170
Former-commit-id: 2e6e031198
2013-10-25 09:59:15 -04:00
Richard Peter
eea185dee4 Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: 31def4a3cb [formerly e439ecafe6] [formerly 464352f731] [formerly 464352f731 [formerly 26df62db53]] [formerly f97a27796d [formerly 464352f731 [formerly 26df62db53] [formerly f97a27796d [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]]
Former-commit-id: f97a27796d
Former-commit-id: 27375ec13048eb9220fc365b509adedcfb9d3b93 [formerly ea1df038b44fa6b4c0db240a0fb0b45969d773c0] [formerly a67f0bf2da [formerly 3f1e17765a]]
Former-commit-id: a67f0bf2da
Former-commit-id: 7f46fbf78f
2013-07-31 12:54:12 -05:00
Richard Peter
1f4131c597 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: d07d74482e [formerly a3d9294d13] [formerly bf99d8fd4d] [formerly bf99d8fd4d [formerly 359ee5d1af]] [formerly 8ba840f1d9 [formerly bf99d8fd4d [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 3e608591d1ee36c6f219a8db5e4be36131e5ec15 [formerly 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9] [formerly 43453bcbff [formerly 16e182d70b]]
Former-commit-id: 43453bcbff
Former-commit-id: 85884ccfd1
2013-07-26 14:36:46 -05:00
Steve Harris
de1f3ab63c 13.5.1-8 baseline
Former-commit-id: 974c5fa6c0 [formerly 52da6c54db] [formerly 392faf86e7] [formerly 392faf86e7 [formerly 3bece5e5d0]] [formerly dfbf9a5afe [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: ddd2c19f3db66af417c2b1c87440c44858e5b8ed [formerly 045a10d1b22e942768c319f31dc18646c3419092] [formerly a7d4c6274e [formerly 2afb46f814]]
Former-commit-id: a7d4c6274e
Former-commit-id: 340e7bab60
2013-07-26 09:02:34 -04:00
Nate Jensen
2565a399d0 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 02127fd804 [formerly 37b332864d] [formerly 25b78917ff] [formerly 25b78917ff [formerly cf656dddc6]] [formerly d364cfe32e [formerly 25b78917ff [formerly cf656dddc6] [formerly d364cfe32e [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]]
Former-commit-id: d364cfe32e
Former-commit-id: 9db8efda270391201a96c9f15a8d1a50e011cd34 [formerly c3a9606c2218691935816ad67207a547e1d9ab53] [formerly f110fe5f6f [formerly dc7c2fd063]]
Former-commit-id: f110fe5f6f
Former-commit-id: 44795095a4
2013-07-25 14:59:01 -05:00
Richard Peter
dd497c8661 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 36361ae0c8 [formerly 19dacc32c1] [formerly 401ed88e44] [formerly 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 401ed88e44 [formerly 15d1a6eab0]]] [formerly c6386e306f [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: ceeb9e903cbfa51936c1e32e3152413eca616a19 [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81] [formerly e7ec068c7e [formerly 12993d9539]]
Former-commit-id: e7ec068c7e
Former-commit-id: 4c53471f8e
2013-07-22 09:40:18 -05:00
Max Schenkelberg
04f82b063f Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 5e50837d4c [formerly cd88054e2b] [formerly 94fa6f0e30] [formerly 94fa6f0e30 [formerly 63421a4819]] [formerly 50825200a1 [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f2a28ca47fdd75f8c3b1d3ff2694ff5c589ea2c2 [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f] [formerly d1881ffa51 [formerly 1610826d2e]]
Former-commit-id: d1881ffa51
Former-commit-id: f025c05d04
2013-07-15 14:26:15 -05:00
Nate Jensen
7af20cbb30 Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: d4a9a329fa [formerly b4265150dd] [formerly 0857f9334a] [formerly 0857f9334a [formerly a6bd01028c]] [formerly a421f83b66 [formerly 0857f9334a [formerly a6bd01028c] [formerly a421f83b66 [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]]]
Former-commit-id: a421f83b66
Former-commit-id: f8e6239ed20e0ec518c141b8eea7a150d608fd9e [formerly 3a5c003e612589c93adb927cf083a1622dfa0422] [formerly c551c5ea8f [formerly 641b52bbab]]
Former-commit-id: c551c5ea8f
Former-commit-id: 4212d6f808
2013-07-11 14:25:36 -05:00
Bryan Kowal
eadb1da9a2 Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: b7801e36b5 [formerly 8924d8fc22] [formerly 4815b78b6f] [formerly 4815b78b6f [formerly b4df3267bd]] [formerly 92b2c6ae65 [formerly 4815b78b6f [formerly b4df3267bd] [formerly 92b2c6ae65 [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 93dac44871697a624224b1f9009d4cc12a58de56 [formerly 705f7197809a3a559d87c56da87de7baa0ca23a6] [formerly ad1d8e35e0 [formerly 5e4350392b]]
Former-commit-id: ad1d8e35e0
Former-commit-id: 27686fad8b
2013-07-03 19:36:42 -05:00
Nate Jensen
5771c7713e Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: 16a59a6c4c [formerly abb3ff9cec] [formerly d5d5c5e674] [formerly d5d5c5e674 [formerly 1fb11fbdf7]] [formerly 47520c7b30 [formerly d5d5c5e674 [formerly 1fb11fbdf7] [formerly 47520c7b30 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]]]
Former-commit-id: 47520c7b30
Former-commit-id: 9ebfc597dfebb4fa95ba1e6ce71eb423f2499730 [formerly 6cc45042cab77ebaeffcf4ae395f265095604db7] [formerly 1bd4d15d7a [formerly 577292d8d5]]
Former-commit-id: 1bd4d15d7a
Former-commit-id: f7920f833c
2013-07-03 13:05:57 -05:00
Greg Armendariz
8ccd4b9cea 13.5.1-5 baseline
Former-commit-id: 1951f88626 [formerly ed9da994c7] [formerly 82aabf1066] [formerly 82aabf1066 [formerly 492f92ef7b]] [formerly ea7ac37930 [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: 68af1c839d01c48f3766f87b60118b91f45d463c [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7] [formerly d899faec3d [formerly 869922cb82]]
Former-commit-id: d899faec3d
Former-commit-id: d5bea0fc06
2013-07-03 12:20:27 -04:00
Steve Harris
7da64307e2 13.5.1-1 baseline
Former-commit-id: 2f344da22c [formerly 5d99df9969] [formerly 6384018950] [formerly 6384018950 [formerly 998961612c]] [formerly fe872355a7 [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: cb6ae479723283672da81805b842b8f452f65ad4 [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69] [formerly 0aab285b8a [formerly 30ba1d634e]]
Former-commit-id: 0aab285b8a
Former-commit-id: 43b7a9b410
2013-06-10 15:17:17 -04:00
Bryan Kowal
5327b592ea Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 4112b04e68 [formerly 1b8179bbf2] [formerly 01413b17dd] [formerly 01413b17dd [formerly 047a3de7bd]] [formerly 99a5290083 [formerly 01413b17dd [formerly 047a3de7bd] [formerly 99a5290083 [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]]]
Former-commit-id: 99a5290083
Former-commit-id: cea140af42592b1c8c52caa0e57f4f17409dc4ac [formerly 5c17e84fa3ea240adbc88fa40b2adcf31c7cdca3] [formerly f57a730309 [formerly 63fa948ba8]]
Former-commit-id: f57a730309
Former-commit-id: 0493669c67
2013-05-15 12:38:02 -05:00
Nate Jensen
fad1ef1bdf Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 895fe171a1 [formerly c5e226e268] [formerly 1fcbeb41c9] [formerly 1fcbeb41c9 [formerly 08b9ce4c62]] [formerly 6f1684b85c [formerly 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 475600f64961fb3fb420a8943d72d4a972e5b4e9 [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555] [formerly dac803ca07 [formerly 22c23492c4]]
Former-commit-id: dac803ca07
Former-commit-id: 575b6335c3
2013-05-14 16:16:13 -05:00
Steve Harris
dfd1fbc9f4 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 95ccb973f9 [formerly 29777b406e] [formerly 344054d3e9] [formerly 344054d3e9 [formerly 1a6fd7edfd]] [formerly 0f76c3cbee [formerly 344054d3e9 [formerly 1a6fd7edfd] [formerly 0f76c3cbee [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]]]
Former-commit-id: 0f76c3cbee
Former-commit-id: bd58348d91e443ccca0622bd1d2e89f4dc3fca89 [formerly 40a0e843311ddd470a12258a3bc95ce73d614c01] [formerly c1349f4a6d [formerly 99a7521fd6]]
Former-commit-id: c1349f4a6d
Former-commit-id: f83b6daf56
2013-05-03 09:20:30 -05:00
Steve Harris
e235e1816a 13.4.1-4 baseline
Former-commit-id: 4ff5dfa203 [formerly ef5893b279] [formerly 99f4569650] [formerly 99f4569650 [formerly d33e5861aa]] [formerly 7a78f8ac6e [formerly 99f4569650 [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 9a49300b3a570514d2949dc78f70ebddad668714 [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829] [formerly 4357e2dacc [formerly 7828293d32]]
Former-commit-id: 4357e2dacc
Former-commit-id: 7d085660f8
2013-05-02 10:00:38 -05:00
Steve Harris
da9bd1f32e 13.4.1-1 baseline
Former-commit-id: 925ad154e1 [formerly 79567aac51] [formerly f95e0ad10b] [formerly f95e0ad10b [formerly 2f517b7713]] [formerly 00332e6305 [formerly f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: c2e9d50521e0a0b5155903c1c3c9d93863cca31a [formerly fff69f92a60e6f16033e299ff1dd2395fac95290] [formerly 0e950655f1 [formerly 4accbb80db]]
Former-commit-id: 0e950655f1
Former-commit-id: aecc3cfd89
2013-04-24 17:15:55 -05:00
Steve Harris
aeae7927f4 13.3.1-14 baseline
Former-commit-id: 32856c7fe7 [formerly f9b3430485] [formerly 91a5e4578e] [formerly 91a5e4578e [formerly 9022c500ce]] [formerly 9fba973fd0 [formerly 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: b2f2ec7e72b00ecd90d3da550c3a26ee4db2d55b [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c] [formerly 936e4adda2 [formerly 2ca160caf0]]
Former-commit-id: 936e4adda2
Former-commit-id: 3cbf22bd96
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
90f0231f79 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: c1b18431cf [formerly 0d765a2fcf] [formerly 0d9119a1c7] [formerly 0d9119a1c7 [formerly 2b6aa86371]] [formerly ed544fc17c [formerly 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]]
Former-commit-id: ed544fc17c
Former-commit-id: 138eb364950ce1016001212990a8dfab9f67c1c0 [formerly b850b70906a6763277fa77ce5a2f3e638139e35a] [formerly b201d9dee2 [formerly 646b61f653]]
Former-commit-id: b201d9dee2
Former-commit-id: 4b0e7e77d3
2013-03-20 13:05:54 -05:00
Steve Harris
e98ea6446e 13.3.1-6 baseline
Former-commit-id: 773ad46112 [formerly 4eef6862d6] [formerly 2e110bd151] [formerly 2e110bd151 [formerly 3a4c7931e1]] [formerly 566b677d09 [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: f5fbbd7106390fe6058dba0c40b94bb2cb99c2d1 [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0] [formerly 6fe4b16924 [formerly 4ed21b702b]]
Former-commit-id: 6fe4b16924
Former-commit-id: 0cec06c171
2013-03-12 08:35:45 -05:00
Steve Harris
ea9303b160 13.3.1-1 baseline
Former-commit-id: 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly d2a654625f [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: c996cf8cb561399a370ef3580c705465d6fa20ac [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0] [formerly e4435815c9 [formerly 46d28be4a4]]
Former-commit-id: e4435815c9
Former-commit-id: db712e1fcf
2013-02-20 16:19:40 -06:00
Steve Harris
771913b0c7 13.1.2-2 baseline
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 4ba416aeb3 [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]
Former-commit-id: cd4185ef5c
Former-commit-id: 82cdde8491
2013-01-06 14:32:24 -06:00
Steve Harris
f58353be7c 12.10.1-4 baseline
Former-commit-id: d8fc6f6ec5 [formerly 0d8d18d7e2] [formerly e38e81ab8c] [formerly e38e81ab8c [formerly fd19ca5624]] [formerly 49c3861597 [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: ecd880ad30f3e8dd0ec83f05ed6cca78b486aaaf [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2] [formerly 684feb34e5 [formerly 2ba58a3576]]
Former-commit-id: 684feb34e5
Former-commit-id: 424c32bd5d
2012-09-13 12:08:11 -05:00
Steve Harris
c68ab3311a 12.9.1-5 baseline
Former-commit-id: 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly f2fac39428 [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: 5b54a131b7dd8cd501953ba8fd918503d0851b4c [formerly 54140b7733222bbc423315196e9781453b12f896] [formerly 7fb0b17bd5 [formerly 72824561cb]]
Former-commit-id: 7fb0b17bd5
Former-commit-id: d9faed979f
2012-08-21 15:27:03 -05:00