Greg Armendariz
b34486973e
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: b59ebac85404fba5657e9041b6f2be7a1959fd9c
2014-07-17 15:41:38 -05:00
Richard Peter
93bbd98cbc
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
2014-07-01 15:34:39 -05:00
Steve Harris
d4dc1723c1
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
2014-07-01 11:08:46 -04:00
Xuezhi.Wei
bdbeec662c
ASM #579 - shef-ingest.xml updates for performance tracking
...
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: f7b5f3bbc71cc251e19f1764ee7756050895b7a3
2014-06-06 17:40:09 +00:00
Steve Harris
518822ed83
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: f8cb49d46f88b801a682a34a3b7056bde1ab2569
2014-05-22 14:31:06 -05:00
brian.dyke
011d121e4b
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Richard Peter
d5ec01f7c0
Omaha #2782 : Update thread based logging
...
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: fe464020d287bbf21b7bc04402d31c97114c195b
2014-05-08 09:06:31 -05:00
Xuezhi.Wei
fb359316c8
ASM #579 Shef Ingest ProcessUtil configuration update
...
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150
Former-commit-id: ddda775e85dd8cba5f4342de330d1446647c621c
2014-05-02 19:48:55 +00:00
Richard Peter
dbba727f3d
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 6e015b3f61c20635077d6e8271e9b763e5a32fe1
2014-04-14 13:10:11 -05:00
Brian.Dyke
cfa4997978
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -05:00
Steve Harris
bd95bb6a4e
14.1.1-4 baseline
...
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
2013-10-28 10:55:16 -04:00
Steve Harris
94f24e0d8a
14.1.1-3 baseline
...
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
2013-10-28 10:46:02 -04:00
Steve Harris
94aa71fcd1
13.5.2-8 baseline
...
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
2013-10-04 11:30:03 -04:00
Steve Harris
70e4ff30a6
13.5.1-4 baseline
...
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
998961612c
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
7435527b25
13.2.1-3 baseline
...
Former-commit-id: ba03739c3528638c5383528fd64674ae5af1ed64
2013-01-23 11:24:17 -05:00
Steve Harris
2c0ff851ca
12.6.1-9 baseline
...
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
