Commit graph

199 commits

Author SHA1 Message Date
David Lovely
5180fac258 Omaha #4382 Removed use of reg.exe
Former-commit-id: 3254d34c04 [formerly 1d00661a47 [formerly 7138fb04f19bd48cdcd23785f524a52db0e8fdd6]]
Former-commit-id: 1d00661a47
Former-commit-id: a7802e271c
2015-04-13 07:44:16 -05:00
Greg Armendariz
82842a4717 Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8

Former-commit-id: 9d95e79cd7 [formerly 7539d84bba [formerly 3a09dc91fbeb7db16a99116ad2582932e3fd6e58]]
Former-commit-id: 7539d84bba
Former-commit-id: 465da92660
2015-02-26 14:03:17 -06:00
Nate Jensen
bea946605f Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
Former-commit-id: ad82097a9e [formerly 601df7e202 [formerly 338968eebfe41680949dc39b60696e2fdc9f96c1]]
Former-commit-id: 601df7e202
Former-commit-id: 5d8b9f55e6
2015-02-26 09:28:55 -06:00
Greg Armendariz
fe5cf3f8e6 Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: 1a3ca4f8df [formerly 6a5463ab87 [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]]
Former-commit-id: 6a5463ab87
Former-commit-id: 2fd4ace0a2
2015-02-25 09:51:49 -06:00
David Lovely
93866e732e Omaha #4164 Fixed AlertViz communications issue and log file directories.
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: e04988d5d2 [formerly d6f74b3e28 [formerly 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369]]
Former-commit-id: d6f74b3e28
Former-commit-id: 1c1ab2943a
2015-02-24 08:24:33 -06:00
Steve Harris
a2d87f74f7 Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10


Former-commit-id: 9311e6f440 [formerly 3fe3d35339 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]
Former-commit-id: 3fe3d35339
Former-commit-id: e76330fac0
2015-02-11 15:53:38 -06:00
Fay.Liang
4bcae42022 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: 43c7161dcf [formerly 59f3f87190 [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]
Former-commit-id: 59f3f87190
Former-commit-id: e3107ce1e4
2015-02-09 17:19:41 -05:00
Ron Anderson
f9c31d4237 Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2

Former-commit-id: 346ea417ea [formerly bdc365d9c9 [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]
Former-commit-id: bdc365d9c9
Former-commit-id: 67443be919
2015-02-02 11:26:59 -06:00
Michael Gamazaychikov
f838759303 ASM #17035 - TextWS locks up when running spell checker.
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3

Former-commit-id: 544437c762 [formerly a0ad2f7136 [formerly 1843d3a64ff42d0533016fd4bb126dd0c86f3f22]]
Former-commit-id: a0ad2f7136
Former-commit-id: 3465706d3b
2015-01-15 16:18:10 -05:00
David Lovely
4b6b382db2 Issue #3804 BigNsharp 32 Bit Binary DLL
Former-commit-id: 7011dcd271 [formerly 96d211ec20 [formerly d4fe863a026c3df816d74ae724276628ab8aa4fb]]
Former-commit-id: 96d211ec20
Former-commit-id: 48f15f5168
2014-11-26 13:39:22 -06:00
Brian Clements
3207d12d51 Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 6d6d3d26e6 [formerly 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]
Former-commit-id: 3a12ab9bdf
Former-commit-id: 78c2aa3650
2014-10-13 16:32:41 -05:00
Nate Jensen
325a15e08f Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59

Former-commit-id: 3eada560b7 [formerly b24faf99cd [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]]
Former-commit-id: b24faf99cd
Former-commit-id: 5ae522c32a
2014-10-13 09:34:22 -05:00
Richard Peter
fddf14712a Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 26e4c16da4 [formerly ed2bd7a261 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]
Former-commit-id: ed2bd7a261
Former-commit-id: db0e85e501
2014-10-09 11:09:32 -05:00
Brian Clements
2112fb8e60 Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631

Former-commit-id: fbabf6f18d [formerly 119b2bff17 [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]
Former-commit-id: 119b2bff17
Former-commit-id: 8d58b8d524
2014-10-09 11:04:49 -05:00
Brian Clements
84217692bf Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 577b3a5e11 [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]
Former-commit-id: 8a4cda892f
Former-commit-id: 4a824111ec
2014-10-08 16:47:10 -05:00
Nate Jensen
0aebb15a38 Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh

Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662

Former-commit-id: 33e3281d55 [formerly e964375fcc [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]
Former-commit-id: e964375fcc
Former-commit-id: 9f74ca65bc
2014-10-02 08:49:32 -05:00
Bryan Kowal
0999a2c431 Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be
built into an RPM for Work Assignments.


Former-commit-id: 1ad9e31075 [formerly 2687b16d49 [formerly 6a5bfb0e00bee647632f12d81bb532a3583f955e]]
Former-commit-id: 2687b16d49
Former-commit-id: 5ec6da9f31
2014-08-06 17:46:39 -05:00
Brian Clements
d6e181d301 Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2

Former-commit-id: ae5fa893a9 [formerly 7e70fbda27 [formerly e4becce5325aad266fd93548d27e5e122b145011]]
Former-commit-id: 7e70fbda27
Former-commit-id: 0973e5ac41
2014-07-14 08:05:18 -05:00
Brian Clements
ed03db05ea Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298

Former-commit-id: 0113e109d3 [formerly 871a8655c8 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]
Former-commit-id: 871a8655c8
Former-commit-id: 987d514fa3
2014-07-10 16:31:11 -05:00
Brian Clements
92be869624 Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc

Former-commit-id: 2773cf8935 [formerly 013292ce9d [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]
Former-commit-id: 013292ce9d
Former-commit-id: fdec99abc5
2014-07-02 14:20:10 -05:00
Nate Jensen
a38a776ac6 Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49

Former-commit-id: 74e2bd1670 [formerly f6cbccdc5c [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]
Former-commit-id: f6cbccdc5c
Former-commit-id: 15d6ff7f79
2014-07-02 11:18:59 -05:00
Nate Jensen
6f28f24afa Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372

Former-commit-id: 765ac1258b [formerly a93af621d8 [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]
Former-commit-id: a93af621d8
Former-commit-id: 1373af3e55
2014-07-02 10:01:05 -05:00
Nate Jensen
e9ffe3f2d6 Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7

Former-commit-id: 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]
Former-commit-id: bca39f8b39
Former-commit-id: d72b56b988
2014-06-30 15:53:41 -05:00
Brian Clements
bb9ea8688b Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd

Former-commit-id: 3b71bedd14 [formerly 0f25ac3b5b [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]
Former-commit-id: 0f25ac3b5b
Former-commit-id: 27a0d3fb28
2014-06-24 11:15:45 -05:00
Nate Jensen
37d6f292f1 Omaha #3245 remove -vm argument
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13

Former-commit-id: d60d2b5caf [formerly 123b22d90a [formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]]
Former-commit-id: 123b22d90a
Former-commit-id: 02372893b6
2014-06-19 14:44:24 -05:00
Nate Jensen
68679fd1a5 Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7

Former-commit-id: 17dc45e7ca [formerly 465a0fef71 [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]
Former-commit-id: 465a0fef71
Former-commit-id: f958ca8de2
2014-06-18 10:03:17 -05:00
Nate Jensen
3828961fa0 Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7

Former-commit-id: 8ab7d86a8f [formerly 19aa9dc96e [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]
Former-commit-id: 19aa9dc96e
Former-commit-id: 2ce0e5aee5
2014-06-17 16:31:20 -05:00
Nate Jensen
172777137a Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 44cb0e6ae6 [formerly 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]
Former-commit-id: 4a91c3320b
Former-commit-id: 14a520dbd9
2014-06-17 10:54:57 -05:00
Nate Jensen
b19785409f Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: 95fe41966a [formerly d4471bf759 [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]
Former-commit-id: d4471bf759
Former-commit-id: 1a94d51831
2014-06-12 11:38:22 -05:00
Steve Harris
08308cd279 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: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 99bc6f990c
Former-commit-id: 3de24b7b07
2014-05-27 14:48:24 -04:00
Brian.Dyke
8c0709798d 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: d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]
Former-commit-id: 627541512d
Former-commit-id: f38d0138e6
2014-05-14 16:08:16 -04:00
Bryan Kowal
aacf4cd27a Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc

Former-commit-id: 8d5326cc1b [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]
Former-commit-id: 3535340136
Former-commit-id: a352aadc90
2014-05-13 14:43:04 -05:00
Shawn.Hooper
5f03948ff5 ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930

Former-commit-id: b4597dc021 [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]
Former-commit-id: a3e52e8cea
Former-commit-id: 9182d8428a
2014-04-25 10:40:43 -04:00
Richard Peter
9b12d9ddaf 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: 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 3575d6586f
Former-commit-id: cd51f3fa87
2014-04-11 16:23:09 -05:00
David Friedman
ee37afaf7b 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: f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]
Former-commit-id: fd900e38c2
Former-commit-id: 32a7adbe4b
2014-03-27 19:17:03 +00:00
Bryan Kowal
d455d71216 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: 286051cbb9 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]
Former-commit-id: a554dc8c20
Former-commit-id: 911c0a99c9
2014-03-26 14:57:46 -05:00
Bryan Kowal
4e4f55eb6c 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: 53d1b8bcbb [formerly 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]]
Former-commit-id: 37a6b85483
Former-commit-id: 065e1dac5e
2014-03-25 13:03:44 -05:00
Steve Harris
1dd9192564 Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]
Former-commit-id: d0aeb854f5
Former-commit-id: 5efb16fa8b
2014-03-17 15:55:41 -05:00
Brian.Dyke
670c673e8a Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]
Former-commit-id: 030a18f804
Former-commit-id: 24a63fb05a
2014-03-14 10:15:53 -04:00
Kevin P. Johnson
c791f55d02 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: 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]
Former-commit-id: b2797a0788
Former-commit-id: e3a951da78
2014-03-13 20:42:12 +00:00
Richard Peter
751b37616e Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 7ebbc0cf78 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]
Former-commit-id: 7af0cfaf38
Former-commit-id: 042468f761
2014-03-12 09:47:29 -05:00
Nate Jensen
ebf5186d75 Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]
Former-commit-id: ccb06db199
Former-commit-id: 17aa39ce0a
2014-03-11 10:28:01 -05:00
Steve Harris
d8badc8bea Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
Former-commit-id: cfc9fea413 [formerly 4c52fb5bb3 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]
Former-commit-id: 4c52fb5bb3
Former-commit-id: e62a399e9f
2014-03-10 16:01:16 -05:00
Nate Jensen
b77dde280f Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]
Former-commit-id: 6a75fe686a
Former-commit-id: 5a88f31a2b
2014-03-10 10:03:02 -05:00
Steve Harris
865fef97b1 Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: 873bd6b889
Former-commit-id: 51b755a476
2014-03-07 15:43:40 -06:00
Steve Harris
da2d7fc334 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]
Former-commit-id: 92232fa063
Former-commit-id: 068297b90a
2014-03-07 15:16:18 -06:00
Brian.Dyke
c2449e7821 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]
Former-commit-id: 394076196b
Former-commit-id: a0e3f08fce
2014-03-07 09:01:09 -05:00
Brian.Dyke
e1cc8eb59a Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]
Former-commit-id: 312cd8a3e8
Former-commit-id: 0bbf137b05
2014-03-07 08:57:07 -05:00
Brian.Dyke
1dcc56775d 14.1.1-22 baseline
Former-commit-id: 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]
Former-commit-id: 21f17d4f9b
Former-commit-id: fe30e1d545
2014-03-07 08:49:00 -05:00
Brad Gonzales
5cdaee1f29 Issue #2885 Updated java version in build.properties.p2.
Change-Id: Ifb266696902142ab59977025ae75010540836ed5

Former-commit-id: b47dc5df40 [formerly 2e224094ad [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]
Former-commit-id: 2e224094ad
Former-commit-id: dadcd2e10b
2014-03-06 17:35:43 -06:00