Steve Harris
4981170462
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: 86e586befedcadf7baa4
2012-02-23 12:38:55 -06:00
Nate Jensen
a914aa38c8
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: fef3fcb60ce3e44707a4
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
0b0047e29d
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 03d9230879703d59a968
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
a2db6975c9
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 73a08e9d4e4dedc8b30d
2012-02-23 10:49:56 -06:00
Steve Harris
c0c0acfbe8
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: a82f2c5750957d232286
2012-02-23 10:19:54 -06:00
Steve Harris
a5f8708b6a
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: e94b322dc3db065fcd50
2012-02-23 10:16:02 -06:00
Steve Harris
92084b3f20
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: 7a10ca9766d0bbbfefcc
2012-02-23 10:06:18 -06:00
Steve Harris
7966ab9369
Merge branch 'OB12.2.1_test' into ss_sync
...
Former-commit-id: 830038b0c66f7f678590
2012-02-23 07:53:15 -06:00
Ben Steffensmeier
b776d953d7
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 55aa66a51006c9d4cdcf
2012-02-22 17:40:48 -06:00
Bryan Kowal
0f02d05283
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: cd35220cf79a63901c0e
2012-02-22 17:07:15 -06:00
Steve Harris
4ff546d3fd
creating OB12.2.1 from ss_sync for testing
...
Former-commit-id: 1fc25c6cb2a7b68a50be
2012-02-22 13:06:47 -06:00
Steve Harris
8da36046de
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
85075e6107
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e2594c2ea985b
2012-02-22 10:12:49 -06:00
Steve Harris
2c12c02910
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: f3fe839c1c84926c80be
2012-02-21 10:37:36 -06:00
Nate Jensen
ba5b1ee03f
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: ec0cd8d086b90611d995
2012-02-21 08:57:12 -06:00
Ben Steffensmeier
27973ec694
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 73d24fad2f69e8cde115
2012-02-20 15:28:20 -06:00
Steve Harris
ef21df5086
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: ebf5e8360e07bf1f770d
2012-02-20 13:04:10 -06:00
Steve Harris
d971880b98
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: 5e9d2dd367cabf9fd956
2012-02-20 13:03:39 -06:00
Steve Harris
a2fd2cf6fa
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: d02529fef46a064cb78b
2012-02-20 12:54:25 -06:00
Steve Harris
c268da57bc
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be244b76d22f77
2012-02-20 12:43:38 -06:00
Steve Harris
e3535054ff
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c825bd03a262c587b841
2012-02-20 07:49:13 -06:00
Bryan Kowal
5754f9dfd8
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 682c10767d10a0ca252d
2012-02-17 12:17:14 -06:00
Bryan Kowal
d4b76c1057
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: 9f1b7a613a4276fc2fe8
2012-02-17 11:09:13 -06:00
Steve Harris
c209d6de36
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: b13730280293f6535bd8
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
38993f5a5a
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 3e3e4bd4e326d82729c9
2012-02-16 16:36:56 -06:00
Steve Harris
c26a22cfb7
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 64ddef69b6e2989d1a9f
2012-02-16 14:23:01 -06:00
Nate Jensen
c20df8b229
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
...
Former-commit-id: 642ad4e9b0bdb08a9f4c
2012-02-16 14:00:33 -06:00
Bryan Kowal
2ce7c520b3
Issue #34 - recompiled the nsharp dll with the latest ncep code.
...
Former-commit-id: 4888756560c8dba08a9d
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
0104e1970d
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 8cf7360e3b28c7e6bc22
2012-02-15 17:10:34 -06:00
Steve Harris
5e2b2ddc22
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 09c3e613e564b3ba9d2b
2012-02-15 15:09:30 -06:00
Steve Harris
68a5ebc0ad
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: c1129dbd00272ba87883
2012-02-15 15:08:58 -06:00
Steve Harris
221a02882a
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: 23cc9689deb9f4780fcb
2012-02-15 14:39:43 -06:00
Steve Harris
6aed9311a8
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 1707b987217356d655da
2012-02-15 14:34:47 -06:00
Steve Harris
d84f7061f7
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
...
Former-commit-id: 86a0e3f5ee05c0347d90
2012-02-15 14:26:22 -06:00
Steve Harris
74c156e508
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: a91b01bfbe5e47f8c33a
2012-02-15 12:54:54 -06:00
Bryan Kowal
2fabaff1d9
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: 521756e57e38eb4bd2b6
2012-02-15 10:31:58 -06:00
Steve Harris
46dda7b8bd
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2e29bc8ee22119a1513e
2012-02-14 15:54:46 -06:00
Steve Harris
7911304736
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: 708348e9e47a28b5ea62
2012-02-14 15:47:32 -06:00
Ben Steffensmeier
808846e237
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: f65d86a06a944e59e989
2012-02-14 15:46:11 -06:00
Steve Harris
1d7daf3576
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
...
Former-commit-id: 376650ce9d3973ed2360
2012-02-14 15:41:54 -06:00
Ben Steffensmeier
8561802d14
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
...
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: b080ab8f6c97000f0738
2012-02-14 15:39:50 -06:00
Nate Jensen
27c3458b5e
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: dd7d200f7fdaeda3f898
2012-02-14 13:06:27 -06:00
Ben Steffensmeier
e2141b574e
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 2995d2b29b100b4c4ba0
2012-02-14 12:59:42 -06:00
Greg Armendariz
fd72f98fc2
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: e3dda29720cb16a5256a
2012-02-13 15:02:29 -06:00
Bryan Kowal
c78e988d55
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: 4faf9831ed67562b0674
2012-02-13 13:57:10 -06:00
Nate Jensen
364cd8f5fc
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: 06327646d9da7d13d933
2012-02-13 11:40:36 -06:00
Bryan Kowal
8e552ca56f
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: c77b9558e134d9122f14
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
6e95175ba2
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: f7985bff7bebbbd0bafc
2012-02-10 12:13:34 -06:00
Bryan Kowal
a19dd6ff33
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 1855bbcbee7ca62dc7d6
2012-02-09 12:14:37 -06:00
Bryan Kowal
8d76a78c47
Issue #202 - fix deploy-install.
...
Former-commit-id: 23f61e09450a141d49d0
2012-02-09 11:28:22 -06:00
