Nate Jensen
|
7af79aca86
|
Omaha #3245 remove -vm argument
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 123b22d90a [formerly 123b22d90a [formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]]
Former-commit-id: d60d2b5caf
Former-commit-id: ef20c3192e
|
2014-06-19 14:44:24 -05:00 |
|
Nate Jensen
|
4129bd518d
|
Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 465a0fef71 [formerly 465a0fef71 [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]
Former-commit-id: 17dc45e7ca
Former-commit-id: a9fc46a6fb
|
2014-06-18 10:03:17 -05:00 |
|
Nate Jensen
|
e59c180fdc
|
Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 19aa9dc96e [formerly 19aa9dc96e [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 451b265ce6
|
2014-06-17 16:31:20 -05:00 |
|
Nate Jensen
|
fe47ecf6ce
|
Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 4a91c3320b [formerly 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: 3981241355
|
2014-06-17 10:54:57 -05:00 |
|
Nate Jensen
|
7fac05ac42
|
Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434
Former-commit-id: d4471bf759 [formerly d4471bf759 [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]
Former-commit-id: 95fe41966a
Former-commit-id: a6fa27a1b8
|
2014-06-12 11:38:22 -05:00 |
|
Steve Harris
|
144354c369
|
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: 99bc6f990c [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
|
2014-05-27 14:48:24 -04:00 |
|
Brian.Dyke
|
f87775928f
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
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
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 627541512d [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]
Former-commit-id: d3fa10028c
Former-commit-id: 68f3a0169e
|
2014-05-14 16:08:16 -04:00 |
|
Bryan Kowal
|
4e3afb78fc
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 3535340136 [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 43eddea171
|
2014-05-13 14:43:04 -05:00 |
|
Shawn.Hooper
|
947b31eb6e
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: a3e52e8cea [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]
Former-commit-id: b4597dc021
Former-commit-id: eeaba5539f
|
2014-04-25 10:40:43 -04:00 |
|
Richard Peter
|
b6482f2e54
|
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: 3575d6586f [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a7ec0bcf66
|
2014-04-11 16:23:09 -05:00 |
|
David Friedman
|
dde12b4fc3
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: fd900e38c2 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]
Former-commit-id: f146c7bcd0
Former-commit-id: 533d15c863
|
2014-03-27 19:17:03 +00:00 |
|
Bryan Kowal
|
f5c1cf750b
|
Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: a554dc8c20 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]
Former-commit-id: 286051cbb9
Former-commit-id: 6b28f08242
|
2014-03-26 14:57:46 -05:00 |
|
Bryan Kowal
|
95f181f95f
|
Issue #2851 - 64-bit gridslice library for Windows
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly
Former-commit-id: 37a6b85483 [formerly 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: dcaac3d61d
|
2014-03-25 13:03:44 -05:00 |
|
Steve Harris
|
3a82fa7ac6
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: d0aeb854f5 [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: b5a2d2237f
|
2014-03-17 15:55:41 -05:00 |
|
Brian.Dyke
|
f20020876a
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 030a18f804 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]
Former-commit-id: 30084d7f84
Former-commit-id: 2109409b24
|
2014-03-14 10:15:53 -04:00 |
|
Kevin P. Johnson
|
eb12ec9c14
|
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: b2797a0788 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]
Former-commit-id: 4c833d3389
Former-commit-id: 17a4229072
|
2014-03-13 20:42:12 +00:00 |
|
Richard Peter
|
e2ae7de485
|
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 7af0cfaf38 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: e8ea7b80e6
|
2014-03-12 09:47:29 -05:00 |
|
Nate Jensen
|
15a2fb216e
|
Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: ccb06db199 [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 22ff235bcf
|
2014-03-11 10:28:01 -05:00 |
|
Steve Harris
|
51150e544b
|
Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
Former-commit-id: 4c52fb5bb3 [formerly 4c52fb5bb3 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]
Former-commit-id: cfc9fea413
Former-commit-id: 57f2a3204e
|
2014-03-10 16:01:16 -05:00 |
|
Nate Jensen
|
19a0cfb972
|
Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: 6a75fe686a [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]
Former-commit-id: d599db4af2
Former-commit-id: 5094008bea
|
2014-03-10 10:03:02 -05:00 |
|
Steve Harris
|
61af779433
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 873bd6b889 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: f60aba35d6
Former-commit-id: 708485427e
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
ea01373320
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 92232fa063 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]
Former-commit-id: 40b543f9a8
Former-commit-id: f992a6b046
|
2014-03-07 15:16:18 -06:00 |
|
Brian.Dyke
|
c8b3730fef
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 394076196b [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]
Former-commit-id: 7b798ab5d2
Former-commit-id: 6ced1bedc2
|
2014-03-07 09:01:09 -05:00 |
|
Brian.Dyke
|
8f2271403d
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 312cd8a3e8 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]
Former-commit-id: 6414bdab57
Former-commit-id: 2f94480121
|
2014-03-07 08:57:07 -05:00 |
|
Brian.Dyke
|
067802b104
|
14.1.1-22 baseline
Former-commit-id: 21f17d4f9b [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: a4c136fd60
|
2014-03-07 08:49:00 -05:00 |
|
Brad Gonzales
|
7b3b48d9b3
|
Issue #2885 Updated java version in build.properties.p2.
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: 2e224094ad [formerly 2e224094ad [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]
Former-commit-id: b47dc5df40
Former-commit-id: 66386f340a
|
2014-03-06 17:35:43 -06:00 |
|
Brad Gonzales
|
c4064160ec
|
Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 0e3dc17872 [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]
Former-commit-id: dea17a19da
Former-commit-id: 78d35d4033
|
2014-03-06 16:29:37 -06:00 |
|
Brian.Dyke
|
b9e9126e11
|
ASM #124 - Display GLD360 lightning data
Former-commit-id: db274c890f [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]
Former-commit-id: eefe8c45fe
Former-commit-id: b657767cb1
|
2014-03-06 10:54:15 -05:00 |
|
Steve Harris
|
36a0533f19
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 069093884f [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 96658d8ce0
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
079cc93f89
|
OB_14.1.1-21 baseline
Former-commit-id: 1d92e5bab6 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]
Former-commit-id: 29681c7ca4
Former-commit-id: 7cad374af5
|
2014-03-04 11:47:42 -05:00 |
|
Richard Peter
|
9b3f8f9649
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 0e25ae35c1 [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 1c150e6e8b
Former-commit-id: f13c86bc3e
|
2014-02-27 15:18:26 -06:00 |
|
Richard Peter
|
9489565efb
|
Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 86d42ed603 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]
Former-commit-id: 862069dfd3
Former-commit-id: c0d495d9c3
|
2014-02-27 13:46:47 -06:00 |
|
Richard Peter
|
9ca22fce7f
|
Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: 729d608a15 [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]
Former-commit-id: d54fee5dae
Former-commit-id: 229437773b
|
2014-02-27 13:20:49 -06:00 |
|
Brian.Dyke
|
5feadbe4d9
|
OB_14.1.1-20 baseline
Former-commit-id: 324696c436 [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 2bad40cfee
Former-commit-id: 16117255f3
|
2014-02-26 17:39:15 -05:00 |
|
Brian.Dyke
|
1b359c2564
|
OB_14.1.1-19 baseline
Former-commit-id: cfa4997978 [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: 10b723647b
Former-commit-id: 64044e7ce5
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
68e03bf02f
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 32bcf9d0d0 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 14a082a4e9
Former-commit-id: d4ba9eba94
|
2014-02-18 10:45:20 -06:00 |
|
Brian.Dyke
|
d1db845406
|
14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 1d6a9456b7
Former-commit-id: c5857c30f2
|
2014-02-11 15:52:50 -05:00 |
|
Brian.Dyke
|
ff2ccb40e4
|
Issue #124
Former-commit-id: 439f053309 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: 90b4e7ebf0
|
2014-02-04 16:56:47 -05:00 |
|
Brian.Dyke
|
948fffa361
|
14.1.1-17 baseline
Former-commit-id: 180d1356cd [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 23280af290
Former-commit-id: 947ec5fd96
|
2014-02-04 12:33:46 -05:00 |
|
Bryan Kowal
|
cf6c6feccc
|
Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)
Former-commit-id: 6fd129379f [formerly 6fd129379f [formerly e027cf42b3b395a834f91512e269e41377f673ef]]
Former-commit-id: 678fb83ded
Former-commit-id: 77370b4e68
|
2014-01-30 18:11:48 -06:00 |
|
Bryan Kowal
|
1ae4a1d919
|
Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
Former-commit-id: d88019d902 [formerly d88019d902 [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]
Former-commit-id: ee95e4de7e
Former-commit-id: bd88b563fe
|
2014-01-29 14:25:38 -06:00 |
|
brian.dyke
|
dcf5f25ed1
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 2294c81a57 [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]
Former-commit-id: f10f6d4e8a
Former-commit-id: e9e2eb3be0
|
2014-01-27 15:27:49 -05:00 |
|
Steve Harris
|
2a967fc9b5
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 24ab7cff49 [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]
Former-commit-id: 69dc3d835b
Former-commit-id: 252c7ee40a
|
2014-01-21 12:36:54 -06:00 |
|
Kevin P. Johnson
|
9f7bddccca
|
Issue #245
Change-Id: I7fca90d9f039b46061bb12a28485c92e21c4fd85
Former-commit-id: e10493f734 [formerly e10493f734 [formerly e776776d797a80b059f00bd78dd0806b7b0f2241]]
Former-commit-id: 75dd01d768
Former-commit-id: d920f4c3c3
|
2014-01-15 14:02:07 +00:00 |
|
Zhidong.Hao
|
8f747dea54
|
Issue #106
Change-Id: Ib33b9294d4fd50d1cd3a815c841d4744ec4ba691
Former-commit-id: 04079da5ad [formerly 04079da5ad [formerly 00e518eafbc5032d4e23128ac0c415d4f9c0ab79]]
Former-commit-id: f3f378bcdc
Former-commit-id: ed44b4b896
|
2014-01-14 12:02:11 -05:00 |
|
Ron Anderson
|
5076217d8f
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.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/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: ba7a25a88f [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: 62c445d872
Former-commit-id: 624375267e
|
2014-01-13 17:45:20 -06:00 |
|
Max Schenkelberg
|
20ba02a238
|
Issue #2620 Reordered developer feature.xml to match p2-build.xml
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67
Former-commit-id: ae7eb39380 [formerly ae7eb39380 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]
Former-commit-id: 73c022da20
Former-commit-id: 8abc1ec611
|
2014-01-10 10:39:07 -06:00 |
|
Steve Harris
|
cd4a09623c
|
14.1.1-15 baseline
Former-commit-id: 8bbd803ace [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]
Former-commit-id: d8e5799328
Former-commit-id: 35d8f5a281
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
a2bdee5cc1
|
14.1.1-14 baseline
Former-commit-id: f2ad9da4eb [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 43cc501e0d
|
2014-01-06 14:02:30 -05:00 |
|
Richard Peter
|
4059813742
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: 1de516964b [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 62fa535744
|
2013-12-17 21:04:53 -06:00 |
|