Shawn.Hooper
|
bbb48e8551
|
Merge branch 'master_16.1.1' into asm_16.1.1
Former-commit-id: 1d9f29deb012fb833757c3960e9c91fea6d2156d
|
2015-08-10 11:41:55 -04:00 |
|
David Friedman
|
be8070e543
|
ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
Change-Id: I66cedc0301d8aac07fb57d4acf72ea61e0633cea
Former-commit-id: 416d74f3b06d4946ddccf670344573c47efd5b40
|
2015-08-07 13:55:03 +00:00 |
|
Richard Peter
|
71049248fd
|
Omaha #3861 - Split npp feature
Change-Id: I68f94b4a07adadc6d3a780e2dfa5fa7c975d0fda
Former-commit-id: 0c16e6144595c5efbb98b3df1249613e93031edb
|
2015-08-05 17:50:23 -05:00 |
|
Richard Peter
|
a0ccfb3288
|
Omaha #3861 - Fix feature build order
Change-Id: Ic85eb0d3a790100a200ca0dcdc09ccbc9f7b1e50
Former-commit-id: 55787e771f70704e4b650f66f905fa748e253873
|
2015-08-05 16:32:54 -05:00 |
|
Steve Harris
|
716970c597
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 2c28db21de36edb64a6a741e93803b3423f5c22c
|
2015-08-04 13:41:21 -05:00 |
|
Steve Harris
|
380c76a769
|
Merge tag 'OB_16.1.1-3' into omaha_16.1.1
16.1.1-3
Former-commit-id: cf16b85be683f57537a2913627489d9c490a972b
|
2015-08-04 12:53:30 -05:00 |
|
David Lovely
|
b9e10fcf31
|
Omaha #4694 Logback configurations will now append user.home to LOGDIR.
Change-Id: I1ed4b3c59d934ac703bd5481b2277beca4ff9568
Former-commit-id: 825064c84ebfa384703074b9be520f03fbb83e8d
|
2015-08-04 12:38:45 -05:00 |
|
Steve Harris
|
f696d5731d
|
Merge tag 'OB_16.1.1-2' into omaha_16.2.1
16.1.1-2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
|
2015-08-03 17:06:31 -05:00 |
|
Fay.Liang
|
b60abcd015
|
Merge branch 'ncep_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: e1a18a5546a67d11e9ba48a7a00646c1a0d08249
|
2015-07-31 16:12:28 -04:00 |
|
David Friedman
|
4bdfeb8da8
|
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
|
2015-07-30 20:53:19 +00:00 |
|
David Friedman
|
2121ce36d7
|
ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
Change-Id: I98cd38b2ada1197511861841b07caf943438cfd3
Former-commit-id: 349b4665855bed697948aadb8fba23a2a761c83f
|
2015-07-23 21:03:06 +00:00 |
|
Nate Jensen
|
ecd14c2cac
|
Omaha #4575 update jep version to 3.4.0
Change-Id: I0a31ed1985ff001c5be8021e68bd4dbf5558547b
Former-commit-id: b9b512b134b2ec1c38b834ff0e29a7d342272976
|
2015-07-21 11:51:39 -05:00 |
|
Xuezhi.Wei
|
939fdfe725
|
ASM #13498 Implementing Xdat standalone.
Change-Id: I5691a5d88345d783a53864c9ebfcd53701da9a3d
Former-commit-id: a0f9799d40e95db3cd7fc9d039fb50705b558ae0
|
2015-07-06 14:55:58 +00:00 |
|
David Lovely
|
cc7f2ece50
|
Omaha #4295 Defined the Linux Cave product file since it does not use build.xml
Former-commit-id: 077d702e92c04d3774a4a870df790325a8daabc7
|
2015-07-01 10:32:09 -05:00 |
|
David Lovely
|
bd94c98253
|
Omaha #4295 Removed AlertViz and the use of bat files on Windows.
Former-commit-id: 254bfd36954d44ee0b639b21b747c4f600ed2678
|
2015-06-30 13:19:23 -05:00 |
|
Joshua Huber
|
13c9b39c3f
|
Merge branch 'omaha_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into ncep_16.1.1
Conflicts:
cave/com.raytheon.viz.feature.awips.developer/feature.xml
Former-commit-id: 798cbcad90c2f21efce44d61733160d9be8eeca0
|
2015-06-29 16:30:10 +00:00 |
|
Roger Ferrel
|
9eebfd0c0e
|
Omaha #4148 Changes to script to use fewer env variables and update logback files.
Change-Id: I8b5b82c4ee371ab10c571a6075c71143bb9e0100
Former-commit-id: 20c1d6c1851012b49f18d43aa6203e4dc51cbd72
|
2015-06-23 15:25:26 -05:00 |
|
Joshua Huber
|
0ebe445a16
|
Merge RM4097 and RM7787 AWIPS2_Dev_Baseline changes from 14.4.1-n to 16.1.1
Former-commit-id: 9a945f3336fba72c4aacc2dab08a51a2ccd1b631
|
2015-06-15 19:14:41 +00:00 |
|
Joshua Huber
|
9d12d32638
|
VLab Issue #4097 - Implement NCP VIIRS viz plugin
Former-commit-id: cd8be322b7d6f1cdcc0ee602523d1d66fb32ff42
|
2015-06-08 20:17:30 +00:00 |
|
Nate Jensen
|
ab85e7a600
|
Omaha #4259 remove LD_PRELOAD usage
Change-Id: I978df385ae00bb4da280cb293d5b0d7f10467097
Former-commit-id: 29988362b0d24787c1b5910feb638fb8770e77d9
|
2015-06-08 11:10:42 -05:00 |
|
Steve Harris
|
4de63454fc
|
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
|
2015-06-05 15:38:00 -05:00 |
|
Fay.Liang
|
31496dac17
|
Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
|
2015-05-29 15:42:40 -04:00 |
|
David Lovely
|
d7502a0a1d
|
Omaha #4530 Use the same PID for the startup-shutdown log
Change-Id: Ie281558f1626c1f08ef54057c96190d11d7d78db
Former-commit-id: f644b90915ecae3fea88f9224d9e9b27d1229a61
|
2015-05-28 12:10:53 -05:00 |
|
Steve Harris
|
9b3d8a8443
|
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
|
2015-05-20 11:25:45 -05:00 |
|
Shawn.Hooper
|
48e06c41ad
|
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
|
2015-05-01 16:12:48 -04:00 |
|
David Lovely
|
812dcfba57
|
Omaha #4382 Removed quotes from batch files
Former-commit-id: 9d8c4774d1834205ad825a27fef10e8ec6a48334
|
2015-04-23 10:07:42 -05:00 |
|
David Lovely
|
3254d34c04
|
Omaha #4382 Removed use of reg.exe
Former-commit-id: 7138fb04f19bd48cdcd23785f524a52db0e8fdd6
|
2015-04-13 07:44:16 -05:00 |
|
Steve Harris
|
963f457d65
|
Omaha #4343 - fixed merge error in p2-build.xml
Former-commit-id: c19ced2dcc9642fe2a0fbdf79f9946ae28429b85
|
2015-03-27 16:04:48 -05:00 |
|
Steve Harris
|
1c1844ad65
|
Merge branch 'omaha_15.1.1' into omaha_16.1.1
Conflicts:
cave/build/p2-build.xml
Former-commit-id: 908fc24c43aab13856a375d8f79b4d0e576bea9a
|
2015-03-27 13:52:27 -05:00 |
|
Nathan Bowler
|
9fbc54b6a8
|
Omaha #3977 Move damage path to own feature to hopefully fix the build.
Change-Id: I0b492538448a2456ff8410c2c460cafa291a030d
Former-commit-id: addfefc19ab515970a64b09ebcca82dde0ba2cf6
|
2015-03-26 17:04:14 -04:00 |
|
David Lovely
|
d21e1da9c0
|
Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build.
Former-commit-id: 542a81d065c7ea5a991965967bf78faae253a029
|
2015-03-25 09:06:45 -05:00 |
|
Nate Jensen
|
b307b49e81
|
Omaha #4278 try/catch throwables in dialog components
Change-Id: Icb349774ff43ced32bdbf2cb9f21712589cfcfdb
Former-commit-id: 9a78fb10bdbe14d77cf29442e1de8a1205c27b66
|
2015-03-23 13:19:27 -05:00 |
|
Steve Harris
|
85b687be0b
|
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
|
2015-03-09 18:54:39 -05:00 |
|
Steve Harris
|
7fb303eff1
|
Merge tag 'OB_14.4.1-15m' into omaha_15.1.1
Former-commit-id: 4fe28e2a0013f77c8a04a56789fc4e101039d77f
|
2015-03-04 21:06:10 -06:00 |
|
Greg Armendariz
|
9d95e79cd7
|
Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8
Former-commit-id: 3a09dc91fbeb7db16a99116ad2582932e3fd6e58
|
2015-02-26 14:03:17 -06:00 |
|
Nate Jensen
|
ad82097a9e
|
Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
Former-commit-id: 338968eebfe41680949dc39b60696e2fdc9f96c1
|
2015-02-26 09:28:55 -06:00 |
|
Greg Armendariz
|
1a3ca4f8df
|
Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2
Former-commit-id: a25d39959ccdc41ab99e0eaf4ad87559adfcb362
|
2015-02-25 09:51:49 -06:00 |
|
David Lovely
|
e04988d5d2
|
Omaha #4164 Fixed AlertViz communications issue and log file directories.
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389
Former-commit-id: 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369
|
2015-02-24 08:24:33 -06:00 |
|
David Lovely
|
39e5c13431
|
Omaha #4130 Added license information to Thin Client
Former-commit-id: e7d2292c8f9d078484cd7f5344de14019649a2e1
|
2015-02-17 13:05:07 -06:00 |
|
Steve Harris
|
9311e6f440
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
|
2015-02-11 15:53:38 -06:00 |
|
Fay.Liang
|
43c7161dcf
|
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: e91a78eec910b84f44350d3aae68a26f4e0dcd72
|
2015-02-09 17:19:41 -05:00 |
|
Ron Anderson
|
346ea417ea
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 9d2f64b08acbec0567c7f29871480827ff0f6de7
|
2015-02-02 11:26:59 -06:00 |
|
Michael Gamazaychikov
|
544437c762
|
ASM #17035 - TextWS locks up when running spell checker.
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3
Former-commit-id: 1843d3a64ff42d0533016fd4bb126dd0c86f3f22
|
2015-01-15 16:18:10 -05:00 |
|
David Lovely
|
7011dcd271
|
Issue #3804 BigNsharp 32 Bit Binary DLL
Former-commit-id: d4fe863a026c3df816d74ae724276628ab8aa4fb
|
2014-11-26 13:39:22 -06:00 |
|
Brian Clements
|
6d6d3d26e6
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 84a91d7b11790d4a37abc9b0a5c2d64952321b52
|
2014-10-13 16:32:41 -05:00 |
|
Nate Jensen
|
3eada560b7
|
Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59
Former-commit-id: 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c
|
2014-10-13 09:34:22 -05:00 |
|
Richard Peter
|
26e4c16da4
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 5977e37b7368487867aca1cfdd362943633f92eb
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
fbabf6f18d
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: 6bc42c58541363bee9be1607b1bdf2aca6f5a000
|
2014-10-09 11:04:49 -05:00 |
|
Brian Clements
|
577b3a5e11
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 771e06df242b0fe7b4eec1e7c3099dfd316182ce
|
2014-10-08 16:47:10 -05:00 |
|
Nate Jensen
|
33e3281d55
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 690868294ab74d5c3b73c12f81534d685bb652aa
|
2014-10-02 08:49:32 -05:00 |
|