Steve Harris
938dc5b21c
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: dcadf7baa486e586befe
2012-02-23 12:38:55 -06:00
Nate Jensen
d03ff9824e
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: e3e44707a4fef3fcb60c
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
6db9a03560
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 703d59a96803d9230879
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
d5d8697d9f
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 4dedc8b30d73a08e9d4e
2012-02-23 10:49:56 -06:00
Steve Harris
8afdef6680
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: 2d25ee941419cf09274c
2012-02-23 10:28:19 -06:00
Steve Harris
e6c3afa7a2
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: 957d232286a82f2c5750
2012-02-23 10:19:54 -06:00
Steve Harris
78ea2de6d3
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: db065fcd50e94b322dc3
2012-02-23 10:16:02 -06:00
Steve Harris
3d511fe719
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
5f6715ed05
Merge branch 'OB12.2.1_test' into ss_sync
...
Former-commit-id: 6f7f678590830038b0c6
2012-02-23 07:53:15 -06:00
Ben Steffensmeier
5d6b036ed7
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 06c9d4cdcf55aa66a510
2012-02-22 17:40:48 -06:00
Bryan Kowal
5ca7ce8373
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 9a63901c0ecd35220cf7
2012-02-22 17:07:15 -06:00
Steve Harris
aaf2fbd05b
creating OB12.2.1 from ss_sync for testing
...
Former-commit-id: a7b68a50be1fc25c6cb2
2012-02-22 13:06:47 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
6d1b04e62c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 84926c80bef3fe839c1c
2012-02-21 10:37:36 -06:00
Nate Jensen
13ea11ddfc
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: b90611d995ec0cd8d086
2012-02-21 08:57:12 -06:00
Steve Harris
b2965389c7
Merge branch 'ss_sync'
...
Former-commit-id: 7be1fb41ea4e1def89e7
2012-02-20 16:51:00 -06:00
Ben Steffensmeier
dcbe4fc7da
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde11573d24fad2f
2012-02-20 15:28:20 -06:00
Steve Harris
5bc52de24a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 07bf1f770debf5e8360e
2012-02-20 13:04:10 -06:00
Steve Harris
33483f3960
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: cabf9fd9565e9d2dd367
2012-02-20 13:03:39 -06:00
Steve Harris
d133454b27
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: 6a064cb78bd02529fef4
2012-02-20 12:54:25 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Steve Harris
0fab56e0f1
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 62c587b841c825bd03a2
2012-02-20 07:49:13 -06:00
Bryan Kowal
2ba23624b4
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 10a0ca252d682c10767d
2012-02-17 12:17:14 -06:00
Bryan Kowal
38ccaf882b
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
...
Former-commit-id: 4276fc2fe89f1b7a613a
2012-02-17 11:09:13 -06:00
Steve Harris
65b22abd24
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd8b137302802
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
d4e7df98a9
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c93e3e4bd4e3
2012-02-16 16:36:56 -06:00
Steve Harris
ff45f4eaab
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: e2989d1a9f64ddef69b6
2012-02-16 14:23:01 -06:00
Nate Jensen
051e8faf55
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
...
Former-commit-id: bdb08a9f4c642ad4e9b0
2012-02-16 14:00:33 -06:00
Bryan Kowal
71fe94b322
Issue #34 - recompiled the nsharp dll with the latest ncep code.
...
Former-commit-id: c8dba08a9d4888756560
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
b819bfa8e9
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 28c7e6bc228cf7360e3b
2012-02-15 17:10:34 -06:00
Steve Harris
3c3eebfd0e
Merge commit 'awips2_OB12.1.1_Omaha'
...
Former-commit-id: 2783331dd61909537682
2012-02-15 15:45:23 -06:00
Steve Harris
17c9ad4c0c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 64b3ba9d2b09c3e613e5
2012-02-15 15:09:30 -06:00
Steve Harris
ad402655f4
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 272ba87883c1129dbd00
2012-02-15 15:08:58 -06:00
Steve Harris
a2e3aabc60
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: b9f4780fcb23cc9689de
2012-02-15 14:39:43 -06:00
Steve Harris
db1e3b1215
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 7356d655da1707b98721
2012-02-15 14:34:47 -06:00
Steve Harris
72466ef0ca
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
...
Former-commit-id: 05c0347d9086a0e3f5ee
2012-02-15 14:26:22 -06:00
Steve Harris
39b13d7102
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: 5e47f8c33aa91b01bfbe
2012-02-15 12:54:54 -06:00
Bryan Kowal
1c023403e2
Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
...
Former-commit-id: 38eb4bd2b6521756e57e
2012-02-15 10:31:58 -06:00
Steve Harris
cb3371ee28
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2119a1513e2e29bc8ee2
2012-02-14 15:54:46 -06:00
Steve Harris
6c719e6fc2
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: 7a28b5ea62708348e9e4
2012-02-14 15:47:32 -06:00
Ben Steffensmeier
d00572c122
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 944e59e989f65d86a06a
2012-02-14 15:46:11 -06:00
Steve Harris
b847ef442c
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
...
Former-commit-id: 3973ed2360376650ce9d
2012-02-14 15:41:54 -06:00
Ben Steffensmeier
2e49f3b6aa
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
...
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 97000f0738b080ab8f6c
2012-02-14 15:39:50 -06:00
Nate Jensen
c49691bc7b
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: daeda3f898dd7d200f7f
2012-02-14 13:06:27 -06:00
Ben Steffensmeier
7914496c96
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 100b4c4ba02995d2b29b
2012-02-14 12:59:42 -06:00
Greg Armendariz
7ce17e1234
Merge "Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console." into 4-Thin_Client
...
Former-commit-id: cb16a5256ae3dda29720
2012-02-13 15:02:29 -06:00
Bryan Kowal
eb91bb964e
Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
...
Former-commit-id: 67562b06744faf9831ed
2012-02-13 13:57:10 -06:00
Nate Jensen
dd8500b081
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: da7d13d93306327646d9
2012-02-13 11:40:36 -06:00
Bryan Kowal
2c3f67d470
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 34d9122f14c77b9558e1
2012-02-13 10:08:15 -06:00
