Commit graph

62 commits

Author SHA1 Message Date
Brian Clements
f9952a79f5 Omaha #3502 removed common.convert from rcm feature
Change-Id: Ide8208d497a2054d8e2ed2a9d37a3aebdcfe174e

Former-commit-id: db8cdc3ae1 [formerly 49c5275ea8] [formerly d1552244bf] [formerly d1552244bf [formerly b93d4be8dd]] [formerly db8cdc3ae1 [formerly 49c5275ea8] [formerly d1552244bf] [formerly d1552244bf [formerly b93d4be8dd]] [formerly a1ab0d0e26 [formerly d1552244bf [formerly b93d4be8dd] [formerly a1ab0d0e26 [formerly 5b81fd2b345855c7642654d2fd5481ae07e1052b]]]]]
Former-commit-id: a1ab0d0e26
Former-commit-id: d7fc9e0dcd [formerly 4d996bebe8] [formerly 867cc336ec] [formerly ce40adc0b4bcec10f2083d5154061968a8b211b3 [formerly 3e98831d754c50d2525a122829073ccc05590c2a] [formerly 867cc336ec [formerly e7246ad695]]]
Former-commit-id: 5b0d119684e6764cae0135fe0fd0e678b5b1211f [formerly f93e751b417fae3087589536d2786a140d4cc3fa] [formerly 9d423b4aca [formerly eeab9ba519]]
Former-commit-id: 9d423b4aca
Former-commit-id: 2967325530
2014-08-11 09:56:53 -05:00
Brian Clements
19c5a2d963 Omaha #3502 added common.convert to alertviz and rcm features
Change-Id: I504f85bedf1a53c6016a1b73a93549ccf3161aac

Former-commit-id: 22266ec2d5 [formerly 8d499b9101] [formerly a28a3d626a] [formerly a28a3d626a [formerly 96b496c98a]] [formerly 22266ec2d5 [formerly 8d499b9101] [formerly a28a3d626a] [formerly a28a3d626a [formerly 96b496c98a]] [formerly a0e9de7745 [formerly a28a3d626a [formerly 96b496c98a] [formerly a0e9de7745 [formerly b4de3831bd44735d3648d93129a4eeaf406a70d0]]]]]
Former-commit-id: a0e9de7745
Former-commit-id: ebae55c5ae [formerly 3682bba710] [formerly 3ae5ced8c0] [formerly 6d24a3107589c9e28902c03515df0c09a7d61134 [formerly bd2575a9717fb006e4da23f9d584bb32f00af42e] [formerly 3ae5ced8c0 [formerly e4a601341c]]]
Former-commit-id: 654d701eb096048e11937ddddc140a11b47189e7 [formerly 727ea40432dabad13e92df56c2e3aef9ac87b8de] [formerly 651247576c [formerly 0f23e0c5b5]]
Former-commit-id: 651247576c
Former-commit-id: 89b15989f5
2014-08-11 08:21:26 -05:00
Greg Armendariz
15018a7c05 Omaha #3309 - Remove reference to slf4j-log4j library
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2

Former-commit-id: 1a94ba6471 [formerly f391c4c4a9] [formerly 58f93a0ecf] [formerly 58f93a0ecf [formerly 7764f65707]] [formerly 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: 90c1e9e5ca [formerly 7b3b30fd88] [formerly 91357204db] [formerly 4a36ce3ffb6bbf403f24e05adb15e3c2d227a2c4 [formerly 4da0ef882938a79525fd990f4df125fa4cf0480a] [formerly 91357204db [formerly 0fa9ec49a0]]]
Former-commit-id: 40d6b2c2c2c56913409e8a432d3171c62289cd16 [formerly 28da2fa135a4d51e0cf2db6822db78163cfae090] [formerly bff7c674d0 [formerly 8389d99db2]]
Former-commit-id: bff7c674d0
Former-commit-id: 91e1bcf9b2
2014-06-26 11:34:47 -05:00
Steve Harris
91c48437cf 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 97843cf58e [formerly 9213369739]] [formerly eece76ad05 [formerly 4d724b6474] [formerly 97843cf58e] [formerly 97843cf58e [formerly 9213369739]] [formerly e1c8ad2611 [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6450c3d6ee [formerly 6cc0c35e76] [formerly d7cd0ac02c] [formerly 1503533d05a69d55df5729868ed86e74147fcedd [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a] [formerly d7cd0ac02c [formerly 362988b9d7]]]
Former-commit-id: c8a2475f45349c68f72a6762c674110a72c5f92a [formerly 54590884305d436b0bff6e041169417a3fab2fbb] [formerly a0d17947a9 [formerly 8270fd8a9f]]
Former-commit-id: 7fa45b27701395fd238cf8765786122a21b0f209 [formerly a0d17947a9]
Former-commit-id: 563cf7b455
2014-06-16 08:19:12 -05:00
brian.dyke
64da6faeab Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 99a5744b5f [formerly f9cf99e369] [formerly 2c2bb61e95] [formerly 2c2bb61e95 [formerly 95c5dc49c1]] [formerly 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: 090b8727ea [formerly 0cbd37db4f] [formerly b6623af1f7] [formerly 857af3fd8ad6799266b1ce17ff1591d0b492620e [formerly 3bc9505e32a1d8fc6fd49b2e6e13c333e4573bb6] [formerly b6623af1f7 [formerly e09bd1d283]]]
Former-commit-id: 205c2218416d1518b6658208d3e4bd4ea5bf959d [formerly 2f8e75b3b74d8ab1aa705815c003473f38cbc788] [formerly 45dd00f016 [formerly 3f9ac5ba24]]
Former-commit-id: c35d4129b1c44a7f59be322a12106f7b4b8b82af [formerly 45dd00f016]
Former-commit-id: 0511ff697f
2014-05-30 10:09:00 -04:00
Brian Clements
644b1be0d1 Omaha #3152 modified rcm build to deploy logback instead of log4j
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac

Former-commit-id: 568cc4c5cc [formerly edb365530e] [formerly 3b2acfc091] [formerly 3b2acfc091 [formerly c227a54da0]] [formerly 568cc4c5cc [formerly edb365530e] [formerly 3b2acfc091] [formerly 3b2acfc091 [formerly c227a54da0]] [formerly 190e877633 [formerly 3b2acfc091 [formerly c227a54da0] [formerly 190e877633 [formerly d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e]]]]]
Former-commit-id: 190e877633
Former-commit-id: 2e0a7b756e [formerly a67277b954] [formerly eb101fbafd] [formerly 49f5de8afd33cacef1fab6b26dfa10b4408b189c [formerly 20c6492e20b9015c6149c8d09099773ee7d7607a] [formerly eb101fbafd [formerly 16e80de9b4]]]
Former-commit-id: dea7c7fb14852193e222bb20efaaa6542084dced [formerly 8c3bc5ef6857e0c2bd83ee89217be08147a7e016] [formerly 927857cbd7 [formerly 0dcd0ebd4e]]
Former-commit-id: 927857cbd7
Former-commit-id: 39fb9517c3
2014-05-28 12:17:39 -05:00
Steve Harris
384d2fa312 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 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: 2ede564cdb [formerly aa133cc8a3] [formerly 0e9d0b2ef5] [formerly 0d288d370383d89f0fd9b620c1af2bfa831fc49c [formerly b7d992179f759d29da9804b9ffcafec8048bcefa] [formerly 0e9d0b2ef5 [formerly 713cfeffc7]]]
Former-commit-id: cc2e29627bf192e53143f9beb0749c892244949a [formerly 4b80090552f8712feaf5137c27c2f010cda148e2] [formerly 5fda99b1fe [formerly 6412cc1427]]
Former-commit-id: 5fda99b1fe
Former-commit-id: 86d6a0cd4d
2014-05-28 09:01:00 -05:00
Daniel.Huffman
bfe2c405d4 ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3

Former-commit-id: 0c89a2b11a [formerly 5019e2d171] [formerly 343046c159] [formerly 343046c159 [formerly eab2733238]] [formerly 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: ee68a61d90 [formerly f1d7154915] [formerly 1bd20432a3] [formerly 090f351ae654032e96f541a503b51e5fc091152d [formerly 4cfe1fd8c4dca6cc4a10913b48925c9c91e851e2] [formerly 1bd20432a3 [formerly b63c845a2b]]]
Former-commit-id: 3f400d30eaad04092bf91f74dab748c3aab2b271 [formerly 1fbadfd2f874be9a3dab9e49e668e0d863835bb6] [formerly 4fc007a417 [formerly 0503a4f11d]]
Former-commit-id: 4fc007a417
Former-commit-id: 9f807e53d4
2014-05-27 19:59:53 +00:00
Steve Harris
e93d032f05 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 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: 7bb35319b2 [formerly 9458ea3648] [formerly bfa4255eea] [formerly 71416a84ea07f551a8d4b12b7a5193d78a44f0d8 [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc] [formerly bfa4255eea [formerly 9b98b41cd4]]]
Former-commit-id: 5123ae7b27223de3c9b15a6ffa2edecab6105980 [formerly a54e34e905540883ccd6d6eb5c78370ac905f651] [formerly 172cca39d9 [formerly 144354c369]]
Former-commit-id: 172cca39d9
Former-commit-id: cf2950abdb
2014-05-27 14:48:24 -04:00
Brian Clements
35107c7df4 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 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: 67bbcd394b [formerly a33678e3d6] [formerly e93c91abf6] [formerly 53f98303027acea2cdb7796938aa5201964bcf5f [formerly 2703a85ab37736c687ec4b4a99e58c9b68e47e13] [formerly e93c91abf6 [formerly b79a9a9e51]]]
Former-commit-id: e63adf4ab50b8c95e26c837ba386dc31fcbff00e [formerly add86e4e11b21c4f7086d1bbfbe0ee88059d767f] [formerly a7c2ce9095 [formerly 040284c727]]
Former-commit-id: a7c2ce9095
Former-commit-id: 7e0f7477b9
2014-05-27 11:11:12 -05:00
Nate Jensen
09a6ab6196 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 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: 512ed128a0 [formerly 3e014a1497] [formerly 5da01d7f7e] [formerly 81b6d133a4221531aa9a64c485cdd1c88e6e540b [formerly a876bfde88b3cc0750826541ee7480aed98b314a] [formerly 5da01d7f7e [formerly 40714c9226]]]
Former-commit-id: b08182bb5eef15df35a7aa55c3598493f3990b38 [formerly e50784b8e0b2a27163445f22d68174d09c553a73] [formerly b5ed8c1960 [formerly 04692e46e2]]
Former-commit-id: b5ed8c1960
Former-commit-id: 063cd0d83b
2014-05-19 11:50:11 -05:00
David Friedman
8f42fd1831 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 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: 1668636171 [formerly 57712d2038] [formerly f8c9026f79] [formerly ca2e9532cc17b9a287d8f63275e44f0464a80cb4 [formerly bee35b0f50c15c2acee4d04f32450273a1e35f20] [formerly f8c9026f79 [formerly 101f43d875]]]
Former-commit-id: 7ce6fc7d611ff527148cbe33a0b3a4c8a60f837e [formerly 8add7e0f674985ab73fd82e03a1a771477439c2f] [formerly f999df6859 [formerly 421d4a56c8]]
Former-commit-id: f999df6859
Former-commit-id: cdd250c2df
2014-05-16 16:40:38 -05:00
David Friedman
d7886313b6 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 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: 53829c16ec [formerly d06f8def65] [formerly 81abf8e7d9] [formerly 4b3799c1d9c5d3a373dc17352b1a0fcc7634387b [formerly 5fa6cc8307089b8f052ac6ad0cfa79f0362dc0ab] [formerly 81abf8e7d9 [formerly 4efaa47d2d]]]
Former-commit-id: 95b6eb7016ec89875e67321d1789f2d1df1cd772 [formerly 80202f6447063c949a9a1aa3353a7e14f3d4094a] [formerly fa63aea622 [formerly e576ddde57]]
Former-commit-id: fa63aea622
Former-commit-id: e4ec928222
2014-05-16 21:38:34 +00:00
David Friedman
61b93a5d6a 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 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: cf7c557b47 [formerly 3a6e887a7c] [formerly ff0f8e731f] [formerly e4fefd422be4ff8fd894fe565e65be7e417f3426 [formerly ab442fed2bdf78f10c432839c809a8791bac6aed] [formerly ff0f8e731f [formerly b62ac936ba]]]
Former-commit-id: 48a470bbcff0337c36cb0628fbd50620697ba1f6 [formerly 21090d6cbb605d49bb525d9b72ed9817b4fb6d94] [formerly 32524f8d3c [formerly f8e5e96774]]
Former-commit-id: a3dfff50589eced46d6b2a13832ffbe6d7407b27 [formerly 32524f8d3c]
Former-commit-id: 3ea4f1dc1b
2014-05-16 21:34:59 +00:00
Richard Peter
cc60be39d7 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 cd51f3fa87 [formerly 3575d6586f]] [formerly 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly cd51f3fa87 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a655029277 [formerly 56089894f2] [formerly d65b11d404] [formerly cba185d0d926f9dea67500ef8d8ab9da489ee4bb [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0] [formerly d65b11d404 [formerly a7ec0bcf66]]]
Former-commit-id: 70c651ece580f217c6e5e6df78b1cbb6c5cec4c5 [formerly ea5917ddde80aa4f2fa095272512ef873794f21c] [formerly a22345ea6b [formerly b6482f2e54]]
Former-commit-id: e0178e9061d12ecb24c62f10b17719ef0668f099 [formerly a22345ea6b]
Former-commit-id: 626ab0bd58
2014-04-11 16:23:09 -05:00
Steve Harris
5bd1b336ff 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 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: 248459109c [formerly 016a659753] [formerly 5d95d594f8] [formerly 49c36ccdd7c47e709711998ff99d0e08642ad435 [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb] [formerly 5d95d594f8 [formerly b5a2d2237f]]]
Former-commit-id: a2f491855110d16e9bcedaa337d52ccdd680fd42 [formerly fde598cdbbe0d12d61ab87081d43c79970894959] [formerly a936941dff [formerly 3a82fa7ac6]]
Former-commit-id: a936941dff
Former-commit-id: 24c55c616c
2014-03-17 15:55:41 -05:00
Brad Gonzales
2b7d49ddb2 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 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: 88556ffdc6 [formerly 09c083ce1f] [formerly 4ba60d8a6f] [formerly e670e0feade57e374fb1c735b6e19bb44c2507cb [formerly f2869efb05c763771e03bc02057aa196d29b6d1a] [formerly 4ba60d8a6f [formerly 78d35d4033]]]
Former-commit-id: 43355841aa7d98fe8c5428fbd0be540315ce710d [formerly f70dd002a68a434eb5e81131bb0b82d4784e717e] [formerly 4cbc3b1b05 [formerly c4064160ec]]
Former-commit-id: 4cbc3b1b05
Former-commit-id: e7295b16d2
2014-03-06 16:29:37 -06:00
David Friedman
a7c3399e93 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 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: 4576be93a6 [formerly 3d09743022] [formerly 7efff2943c] [formerly ddfcc80ebdfc75765aee7fcbd90fcbb1b8420dde [formerly 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a] [formerly 7efff2943c [formerly 591ce333dc]]]
Former-commit-id: edbdcefcd8029e078b6865581a69a3f544376263 [formerly 89fc9937b925fbd68ad74bb2b24a9bffae38c3df] [formerly 3dde8aeda7 [formerly 89b6f79565]]
Former-commit-id: 3dde8aeda7
Former-commit-id: b62acbc154
2014-03-06 17:07:23 +00:00
David Friedman
e2969cf9c3 ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 13fb60e29c [formerly 9caca1ee5a] [formerly 24ebf8854c] [formerly 24ebf8854c [formerly 611503cd96]] [formerly 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: dc0424935d [formerly 50718c4b94] [formerly ecae4f3099] [formerly 69faa4aa60bed2470a351f117bdf25ab4eb20720 [formerly 77ef332e564a2c699a3b6861f3fd44e198b991d1] [formerly ecae4f3099 [formerly 8591015dfb]]]
Former-commit-id: 7b25be1f5d06ccf6764cfe9c2eb9942b6336b94d [formerly 79da3bf76b673096339786e9dcd1acc881b16184] [formerly 84b45a2ee0 [formerly d63a17f725]]
Former-commit-id: 84b45a2ee0
Former-commit-id: 8b3da18a7f
2014-02-03 19:03:50 +00:00
Greg Armendariz
35631b6d03 Issue #2754 - Remove commons logging calls
Former-commit-id: 5fd21d524e [formerly 689ca84b3f] [formerly efe8011970] [formerly efe8011970 [formerly fa27142ec2]] [formerly 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: 38eead2cba [formerly 05e48bb7f4] [formerly 9f09293f2e] [formerly f23aed09dce97fad90de1cb961cd9c54de484ab9 [formerly 5cf42a9b3e606e1eccdf9c5c70d6bb76b2ced605] [formerly 9f09293f2e [formerly accf0505a5]]]
Former-commit-id: 4e238414a53938033cd3b3d56776d82746023813 [formerly 9cccab557a978db071ec2a16d72dccc77908920c] [formerly 4600cda583 [formerly e568b3792d]]
Former-commit-id: 4600cda583
Former-commit-id: 5e2df6a0b4
2014-02-03 12:17:30 -06:00
brian.dyke
d0df06c218 merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 4a62e83835 [formerly 2294c81a57]]] [formerly 5b74176d3b [formerly becf6322c6] [formerly 4a62e83835] [formerly f121ee384ae6474f6d0db204389a1736d5bede01 [formerly 4a62e83835 [formerly 2294c81a57]]] [formerly f10f6d4e8a [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 21a827151b [formerly ac37e2ea2e] [formerly 621464ac0d] [formerly 9043d578b89b573988a90ad05bb77fa0d18398cc [formerly 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629] [formerly 621464ac0d [formerly e9e2eb3be0]]]
Former-commit-id: 9f664eca18786308211e3ab9e6cacef5813f30a4 [formerly ee40d762efff70a1679bc3c2641d377b51facc3b] [formerly ca9263003a [formerly dcf5f25ed1]]
Former-commit-id: ca9263003a
Former-commit-id: 4744c64069
2014-01-27 15:27:49 -05:00
Max Schenkelberg
f794d5eb29 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 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: 96f972a617 [formerly 257553461b] [formerly 0ceaa43902] [formerly e16937349bd8e68e34180a13f051ca191ec3a50a [formerly d612c358920d902e7385e86659fc1d050de57dd4] [formerly 0ceaa43902 [formerly f58795f460]]]
Former-commit-id: 0cd5cbe22dea8105d0396734a0dfcadaa585f2c6 [formerly e6116ab5b34627162fc751f613c0b7f4743d9668] [formerly 783391423f [formerly 789a279475]]
Former-commit-id: 783391423f
Former-commit-id: e0b7ba7058
2014-01-06 17:03:45 -06:00
David Friedman
2fa9723c34 Issue #74
Change-Id: I68539f26778ddea09ad23f4f938122157a6813b1

Former-commit-id: e03160376e [formerly 0eb9282611] [formerly baea134dd9] [formerly baea134dd9 [formerly 53c48228d9]] [formerly 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: cee7206aaa [formerly 838e6e07a1] [formerly a23db3e2d8] [formerly 39960e31d1d451f2496b9fd07bf8cdcee7db81d1 [formerly 69fb8ad726141c1b24cd2910d6717e3def193407] [formerly a23db3e2d8 [formerly 4a75e255a8]]]
Former-commit-id: d17e1874c5831bf011bd44e3297efa06d3571ee8 [formerly f954fe4e54cfde2408f25f495800aa2d1ead77c7] [formerly 93814cfacc [formerly 154c8a6f68]]
Former-commit-id: 93814cfacc
Former-commit-id: 788b4fbd22
2013-12-18 16:37:36 +00:00
Richard Peter
123f276fe4 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 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: 26df6d6e8c [formerly 112816a54c] [formerly 3f68fc6eed] [formerly e4907f5885a36a91d1b65e6e0a89871cb695adee [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d] [formerly 3f68fc6eed [formerly 59671c1e7d]]]
Former-commit-id: 7f344e9740b2837f8eeb9555c3f79116a0bdd426 [formerly 8b93a7813019963981a150f64ec44daf5d188cde] [formerly ef23a8f65b [formerly c8ef435295]]
Former-commit-id: ef23a8f65b
Former-commit-id: ff729f46b5
2013-11-12 11:11:36 -06:00
Bryan Kowal
287157fcf8 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 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: 7d6056dd7c [formerly b2fb3cc71b] [formerly 464a8d1001] [formerly aae2270294458776d8c79553bb88ddf84eb0cf92 [formerly 9832b7353c98edff371d73697564b1585403dd75] [formerly 464a8d1001 [formerly 1909193f0c]]]
Former-commit-id: ceac0f0136dc4e51dbad0aeb593169a7a3234ab1 [formerly bbe6693bef01b8fb05627cf015f2b987c0a64c90] [formerly 9f749f3079 [formerly dfba50bf2e]]
Former-commit-id: 438a06b73c1f19147a3b3bc0876ae82aa7b496ba [formerly 9f749f3079]
Former-commit-id: 74664b1def
2013-11-08 14:51:47 -06:00
Richard Peter
506b9ea881 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 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: 447789f1a1 [formerly aec254aac0] [formerly c97efbf656] [formerly c13fde9952c4d04bb5a99e02ea658bf020889a28 [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4] [formerly c97efbf656 [formerly 520dd57f02]]]
Former-commit-id: bd3cda21062207e12d08d0b319ce56183936d10b [formerly 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe] [formerly 94e0faa6c6 [formerly 910464ea6a]]
Former-commit-id: 94e0faa6c6
Former-commit-id: 0bcf000a31
2013-11-07 14:25:45 -06:00
Steve Harris
3deaeee77c 14.1.1-6 baseline
Former-commit-id: 074a9d0f18 [formerly f44bae4383] [formerly 946a9be17e] [formerly 946a9be17e [formerly 0cb2978c13]] [formerly 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: 9e24b1f2db [formerly 2a5f4c26d6] [formerly e86a0aa489] [formerly 0e6c13ff0923d55fc492817e918e7f877d10c7d8 [formerly 70967acd51143f4f43cec1322c400d567f95c3ce] [formerly e86a0aa489 [formerly 26da1ce793]]]
Former-commit-id: c6bbbd4aee94edbacc6d618137edbb59932ff6ef [formerly 30c24036c09dc21bf6f32deefe9a7a44f35d8005] [formerly 0aa90a7855 [formerly 270c5f1a2d]]
Former-commit-id: f1e3adbba7742577c71930403c136208fbaa598b [formerly 0aa90a7855]
Former-commit-id: 24ec3c5993
2013-11-06 14:08:33 -05:00
Steve Harris
2ca9559de2 14.1.1-3 baseline
Former-commit-id: 0cc505a64a [formerly a0ba2e1252] [formerly 851f9df229] [formerly 851f9df229 [formerly 94f24e0d8a]] [formerly 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: 6e4187af3c [formerly 2d30611c6d] [formerly aa59400b67] [formerly e5bec8304375023d2850a2bca444926f4925c949 [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19] [formerly aa59400b67 [formerly 4a6a209aea]]]
Former-commit-id: 04d097d14d16b1e927137c3ca7c25238be8c309d [formerly 9a1c18417dfee86a141522f27e066ec83d4258d5] [formerly 472c0a1a5e [formerly 8d67ffede4]]
Former-commit-id: 472c0a1a5e
Former-commit-id: c784003711
2013-10-28 10:46:02 -04:00
Steve Harris
f45f9a3f07 13.5.2-12 baseline
Former-commit-id: 59dc1c29ae [formerly 845d49e370] [formerly e2b9baf2ed] [formerly e2b9baf2ed [formerly a532896473]] [formerly 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: 38d7b39899 [formerly 2e6e031198] [formerly 15d9848170] [formerly 4ad1774e666d5cd6daf65394e12de3bad5132c64 [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3] [formerly 15d9848170 [formerly b70ec5732d]]]
Former-commit-id: 8a84734c6e03b0e0bce1da2a593ca76ec0296c92 [formerly d6cb813e26904b36ed5b21ea7664539b21d552fa] [formerly f97c128cc8 [formerly 248e79aa2f]]
Former-commit-id: f97c128cc8
Former-commit-id: d1c823fe65
2013-10-25 09:59:15 -04:00
Richard Peter
3fff676981 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 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: eea185dee4 [formerly 7f46fbf78f] [formerly a67f0bf2da] [formerly 27375ec13048eb9220fc365b509adedcfb9d3b93 [formerly ea1df038b44fa6b4c0db240a0fb0b45969d773c0] [formerly a67f0bf2da [formerly 3f1e17765a]]]
Former-commit-id: 2934fe44172f31fa85c08a30cfb284251ccad7f7 [formerly 9973bf82bd2bdd62c09a917e8fc0870c0a2147d1] [formerly 33d4f95c3e [formerly 5314b90720]]
Former-commit-id: 161928091290ab4d8546ba6eced6522e5ae5404f [formerly 33d4f95c3e]
Former-commit-id: be84d709e4
2013-07-31 12:54:12 -05:00
Richard Peter
d01769e919 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: d07d74482e [formerly a3d9294d13] [formerly bf99d8fd4d] [formerly bf99d8fd4d [formerly 359ee5d1af]] [formerly 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: 1f4131c597 [formerly 85884ccfd1] [formerly 43453bcbff] [formerly 3e608591d1ee36c6f219a8db5e4be36131e5ec15 [formerly 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9] [formerly 43453bcbff [formerly 16e182d70b]]]
Former-commit-id: e177069cb9abb7e4ad402e195bc433a799098202 [formerly a4aa95423528b7d80ac7bfb1f4727754c4129e0b] [formerly 5665e7eb9e [formerly 51773c757e]]
Former-commit-id: 5665e7eb9e
Former-commit-id: 4e00a449b7
2013-07-26 14:36:46 -05:00
Steve Harris
2cdc6c2c49 13.5.1-8 baseline
Former-commit-id: 974c5fa6c0 [formerly 52da6c54db] [formerly 392faf86e7] [formerly 392faf86e7 [formerly 3bece5e5d0]] [formerly 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: de1f3ab63c [formerly 340e7bab60] [formerly a7d4c6274e] [formerly ddd2c19f3db66af417c2b1c87440c44858e5b8ed [formerly 045a10d1b22e942768c319f31dc18646c3419092] [formerly a7d4c6274e [formerly 2afb46f814]]]
Former-commit-id: 3589e4802af7525fe8fe578ef6d85da3ab681b40 [formerly 25e673600ebb4cafb2c67928841e30149139a498] [formerly 767b7fdb4d [formerly 1a3197efdf]]
Former-commit-id: 767b7fdb4d
Former-commit-id: dded20dc93
2013-07-26 09:02:34 -04:00
Nate Jensen
1278af0b2a 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 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: 2565a399d0 [formerly 44795095a4] [formerly f110fe5f6f] [formerly 9db8efda270391201a96c9f15a8d1a50e011cd34 [formerly c3a9606c2218691935816ad67207a547e1d9ab53] [formerly f110fe5f6f [formerly dc7c2fd063]]]
Former-commit-id: 90ae7e4361e276a6c13702651896e2e948641d52 [formerly 8543575d14e7cd2b4a3450133c48990eda4cfc72] [formerly 63ac241687 [formerly 070fa38093]]
Former-commit-id: 63ac241687
Former-commit-id: f32313b6a2
2013-07-25 14:59:01 -05:00
Richard Peter
477c4a841b 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 401ed88e44 [formerly 15d1a6eab0]] [formerly 36361ae0c8 [formerly 19dacc32c1] [formerly 401ed88e44] [formerly 401ed88e44 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]]
Former-commit-id: c6386e306f
Former-commit-id: dd497c8661 [formerly 4c53471f8e] [formerly e7ec068c7e] [formerly ceeb9e903cbfa51936c1e32e3152413eca616a19 [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81] [formerly e7ec068c7e [formerly 12993d9539]]]
Former-commit-id: 695bc3e79dd459353e36b44ad602e0bc8c50d8ab [formerly 468a024f2957450aa44633c7888eb3aad2011b85] [formerly 2a9cfe51af [formerly 85fc9c773b]]
Former-commit-id: 519f5705ca875b71bedfeb00d8cfdc1cd6c3c2ea [formerly 2a9cfe51af]
Former-commit-id: 1d08e54d43
2013-07-22 09:40:18 -05:00
Max Schenkelberg
b1a5c51237 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 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: 04f82b063f [formerly f025c05d04] [formerly d1881ffa51] [formerly f2a28ca47fdd75f8c3b1d3ff2694ff5c589ea2c2 [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f] [formerly d1881ffa51 [formerly 1610826d2e]]]
Former-commit-id: 0cb89f5ac334e5eca960f634833c12e40bf541ef [formerly a38fe0e4cd744ea32b4c88e97305cabc3dbac06f] [formerly 5ba50b4476 [formerly a47f187f4f]]
Former-commit-id: 5ba50b4476
Former-commit-id: ad32bbd91d
2013-07-15 14:26:15 -05:00
Nate Jensen
6a42880acf Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: d4a9a329fa [formerly b4265150dd] [formerly 0857f9334a] [formerly 0857f9334a [formerly a6bd01028c]] [formerly 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: 7af20cbb30 [formerly 4212d6f808] [formerly c551c5ea8f] [formerly f8e6239ed20e0ec518c141b8eea7a150d608fd9e [formerly 3a5c003e612589c93adb927cf083a1622dfa0422] [formerly c551c5ea8f [formerly 641b52bbab]]]
Former-commit-id: 4459fe5eddb386e65eb50c0a4fa0ee4a773a1f0e [formerly f09ddaaebb7b95d5d83d683c7669c4811e140866] [formerly cf151e4e1b [formerly 69f59343b9]]
Former-commit-id: cf151e4e1b
Former-commit-id: 4c394503c6
2013-07-11 14:25:36 -05:00
Bryan Kowal
87020976fe Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: b7801e36b5 [formerly 8924d8fc22] [formerly 4815b78b6f] [formerly 4815b78b6f [formerly b4df3267bd]] [formerly 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: eadb1da9a2 [formerly 27686fad8b] [formerly ad1d8e35e0] [formerly 93dac44871697a624224b1f9009d4cc12a58de56 [formerly 705f7197809a3a559d87c56da87de7baa0ca23a6] [formerly ad1d8e35e0 [formerly 5e4350392b]]]
Former-commit-id: 7c3f42e6369e9cf77d546373cc3cde0e46b3f3d9 [formerly 568e321d20a3d8de2757a381fc09aed57c4492e4] [formerly e34d55b8bd [formerly b07e3f47da]]
Former-commit-id: e34d55b8bd
Former-commit-id: c39a671b1d
2013-07-03 19:36:42 -05:00
Nate Jensen
28b975077c Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: 16a59a6c4c [formerly abb3ff9cec] [formerly d5d5c5e674] [formerly d5d5c5e674 [formerly 1fb11fbdf7]] [formerly 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: 5771c7713e [formerly f7920f833c] [formerly 1bd4d15d7a] [formerly 9ebfc597dfebb4fa95ba1e6ce71eb423f2499730 [formerly 6cc45042cab77ebaeffcf4ae395f265095604db7] [formerly 1bd4d15d7a [formerly 577292d8d5]]]
Former-commit-id: 8dda73e44b5616c3c0bc0679340f3dd8044c1cf3 [formerly 83cd7dbef7f71c6ac8b00c29a8e5131a52824b75] [formerly 28ae926f33 [formerly 2286c25c51]]
Former-commit-id: 28ae926f33
Former-commit-id: 23a02c5519
2013-07-03 13:05:57 -05:00
Greg Armendariz
e72669bfd6 13.5.1-5 baseline
Former-commit-id: 1951f88626 [formerly ed9da994c7] [formerly 82aabf1066] [formerly 82aabf1066 [formerly 492f92ef7b]] [formerly 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: 8ccd4b9cea [formerly d5bea0fc06] [formerly d899faec3d] [formerly 68af1c839d01c48f3766f87b60118b91f45d463c [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7] [formerly d899faec3d [formerly 869922cb82]]]
Former-commit-id: 344733fcc6b191d7ff30f179ad264140a76b6a9d [formerly 22058c6a24f6da687ba40d05b28790e525082567] [formerly 13ac0b1062 [formerly dc881f4ed8]]
Former-commit-id: 13ac0b1062
Former-commit-id: 5e1549062b
2013-07-03 12:20:27 -04:00
Steve Harris
98b3f1481d 13.5.1-1 baseline
Former-commit-id: 2f344da22c [formerly 5d99df9969] [formerly 6384018950] [formerly 6384018950 [formerly 998961612c]] [formerly 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: 7da64307e2 [formerly 43b7a9b410] [formerly 0aab285b8a] [formerly cb6ae479723283672da81805b842b8f452f65ad4 [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69] [formerly 0aab285b8a [formerly 30ba1d634e]]]
Former-commit-id: 846a8749d39dba5372665179e09a90710c861d92 [formerly 83a711e54bdd8cabc147e6ca5222939082f46f9c] [formerly 859965fc9d [formerly 146c5e8940]]
Former-commit-id: 859965fc9d
Former-commit-id: 97a4c59662
2013-06-10 15:17:17 -04:00
Bryan Kowal
f82a02dd75 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 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: 5327b592ea [formerly 0493669c67] [formerly f57a730309] [formerly cea140af42592b1c8c52caa0e57f4f17409dc4ac [formerly 5c17e84fa3ea240adbc88fa40b2adcf31c7cdca3] [formerly f57a730309 [formerly 63fa948ba8]]]
Former-commit-id: 75d7bc325fce4485a2e55615a3f2cc16b6d41b02 [formerly 4859ba98ba249ddd22070655c299a50b4c825a27] [formerly 2deeffdb51 [formerly 7692701168]]
Former-commit-id: bcb1571cb33663f0321413b8adf67cac4db36c20 [formerly 2deeffdb51]
Former-commit-id: 47d6de2275
2013-05-15 12:38:02 -05:00
Nate Jensen
60837117e4 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 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: fad1ef1bdf [formerly 575b6335c3] [formerly dac803ca07] [formerly 475600f64961fb3fb420a8943d72d4a972e5b4e9 [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555] [formerly dac803ca07 [formerly 22c23492c4]]]
Former-commit-id: 57244b5b455b212ed520cee4831de3878e39d243 [formerly ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d] [formerly 0080d492e2 [formerly 925339b84c]]
Former-commit-id: 0080d492e2
Former-commit-id: 6b9fa8445b
2013-05-14 16:16:13 -05:00
Steve Harris
fd46b82625 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 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: dfd1fbc9f4 [formerly f83b6daf56] [formerly c1349f4a6d] [formerly bd58348d91e443ccca0622bd1d2e89f4dc3fca89 [formerly 40a0e843311ddd470a12258a3bc95ce73d614c01] [formerly c1349f4a6d [formerly 99a7521fd6]]]
Former-commit-id: 3c45d3063b5d39a7e17fa46789bc9cabb3a0b2f9 [formerly aa7844c83d5bb0a0e9bf3d45f714ce4f67810c47] [formerly e1a369a499 [formerly 764924cd1e]]
Former-commit-id: e1a369a499
Former-commit-id: 4647d70fd8
2013-05-03 09:20:30 -05:00
Steve Harris
8a7cf3eabe 13.4.1-4 baseline
Former-commit-id: 4ff5dfa203 [formerly ef5893b279] [formerly 99f4569650] [formerly 99f4569650 [formerly d33e5861aa]] [formerly 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: e235e1816a [formerly 7d085660f8] [formerly 4357e2dacc] [formerly 9a49300b3a570514d2949dc78f70ebddad668714 [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829] [formerly 4357e2dacc [formerly 7828293d32]]]
Former-commit-id: 362287679620b88539cb0dcbcdfca615e380f3fd [formerly 6fc143d13d42b0d419bcede3614f0ee982260764] [formerly 5dbfeb38ac [formerly e0986cfda8]]
Former-commit-id: 5dbfeb38ac
Former-commit-id: ba48ab0362
2013-05-02 10:00:38 -05:00
Steve Harris
28575f2d5a 13.4.1-1 baseline
Former-commit-id: 925ad154e1 [formerly 79567aac51] [formerly f95e0ad10b] [formerly f95e0ad10b [formerly 2f517b7713]] [formerly 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: da9bd1f32e [formerly aecc3cfd89] [formerly 0e950655f1] [formerly c2e9d50521e0a0b5155903c1c3c9d93863cca31a [formerly fff69f92a60e6f16033e299ff1dd2395fac95290] [formerly 0e950655f1 [formerly 4accbb80db]]]
Former-commit-id: 1f94762c63ba22c1041bf3a9ffa6532ceb6ceeac [formerly 85465ead73fe31102e486ee012a5fcb51cfcc9b9] [formerly 722e428c74 [formerly 4001e050e7]]
Former-commit-id: 722e428c74
Former-commit-id: b0fb1f49be
2013-04-24 17:15:55 -05:00
Steve Harris
c95f7b0992 13.3.1-14 baseline
Former-commit-id: 32856c7fe7 [formerly f9b3430485] [formerly 91a5e4578e] [formerly 91a5e4578e [formerly 9022c500ce]] [formerly 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: aeae7927f4 [formerly 3cbf22bd96] [formerly 936e4adda2] [formerly b2f2ec7e72b00ecd90d3da550c3a26ee4db2d55b [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c] [formerly 936e4adda2 [formerly 2ca160caf0]]]
Former-commit-id: 99af1aed75ccdfbeec5892e282b7d9cbc560ebc1 [formerly 8c6b23e522a402fa4cd1e6df150e646e4689e3b0] [formerly f59f1f02b0 [formerly 8237fdadaa]]
Former-commit-id: f59f1f02b0
Former-commit-id: 43942dad11
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
11476d7855 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: c1b18431cf [formerly 0d765a2fcf] [formerly 0d9119a1c7] [formerly 0d9119a1c7 [formerly 2b6aa86371]] [formerly 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: 90f0231f79 [formerly 4b0e7e77d3] [formerly b201d9dee2] [formerly 138eb364950ce1016001212990a8dfab9f67c1c0 [formerly b850b70906a6763277fa77ce5a2f3e638139e35a] [formerly b201d9dee2 [formerly 646b61f653]]]
Former-commit-id: 1b311c0985427233098a2a49273485f4d6e4f12a [formerly 054b143635c076ebd5e79c9bbfe409552cff76ec] [formerly 4cde2bd826 [formerly 498d153e40]]
Former-commit-id: 4cde2bd826
Former-commit-id: a503ef0938
2013-03-20 13:05:54 -05:00
Steve Harris
7baae9e023 13.3.1-6 baseline
Former-commit-id: 773ad46112 [formerly 4eef6862d6] [formerly 2e110bd151] [formerly 2e110bd151 [formerly 3a4c7931e1]] [formerly 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: e98ea6446e [formerly 0cec06c171] [formerly 6fe4b16924] [formerly f5fbbd7106390fe6058dba0c40b94bb2cb99c2d1 [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0] [formerly 6fe4b16924 [formerly 4ed21b702b]]]
Former-commit-id: c8b9fbe2f99759feef8f59a92c8b74c2e3f1b45f [formerly 0e585016165e18d475399f775c1938136de541c6] [formerly c28f3aeb02 [formerly c6f379f59a]]
Former-commit-id: c28f3aeb02
Former-commit-id: ed1788343e
2013-03-12 08:35:45 -05:00
Steve Harris
915a15006f 13.3.1-1 baseline
Former-commit-id: 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly 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: ea9303b160 [formerly db712e1fcf] [formerly e4435815c9] [formerly c996cf8cb561399a370ef3580c705465d6fa20ac [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0] [formerly e4435815c9 [formerly 46d28be4a4]]]
Former-commit-id: 4e2c476e2dfb865dde40c9f94f4d16824ed729f6 [formerly 30806b31de967d82824f245a2f6cb89f081cfd19] [formerly 8c828dbd75 [formerly b3b56830b0]]
Former-commit-id: 35d8262ef1ba032fcf5d8ea707ad15ee533bd1a9 [formerly 8c828dbd75]
Former-commit-id: fac2d20002
2013-02-20 16:19:40 -06:00
Steve Harris
2827d6bd6e 13.1.2-2 baseline
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 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: 771913b0c7 [formerly 82cdde8491] [formerly cd4185ef5c] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0 [formerly b6fa9b4858]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
2013-01-06 14:32:24 -06:00