Steve Harris
d6b489e69e
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: fee006734577fd51f05ca5e9ce211d36d2b9fe57
2012-02-23 13:18:15 -06:00
Steve Harris
f081d1a6d4
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: 5aa15dec35cf72a46288613e42e6cb02b94320a6
2012-02-23 13:17:26 -06:00
Steve Harris
f9baa1c98c
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: 2059372e90437312cf12f06de6c84d0824fb586c
2012-02-23 13:16:35 -06:00
Steve Harris
c502603907
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: cccea1aa13ad987a8c1f2b06c2dfcaa77967544d
2012-02-23 12:45:50 -06:00
Steve Harris
dcadf7baa4
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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Nate Jensen
e3e44707a4
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: fd448c2a996aef215802dc501b68d28747f66414
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
703d59a968
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 2e22a794183e4be8758997b9e76f896917a761db
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
4dedc8b30d
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 951c8c2a77c8f58a04a576148ac583ccdcc21e02
2012-02-23 10:49:56 -06:00
Steve Harris
2d25ee9414
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: a1b82aa2367ca506175ab0fec425c9e633ce949f
2012-02-23 10:28:19 -06:00
Steve Harris
957d232286
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: de97ce5f9b687f7404a34cac0b1fc34df5f854cb
2012-02-23 10:19:54 -06:00
Steve Harris
db065fcd50
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb
2012-02-23 10:16:02 -06:00
Steve Harris
d0bbbfefcc
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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
6f7f678590
Merge branch 'OB12.2.1_test' into ss_sync
...
Former-commit-id: 76967f2151dcfb275be389c04060ff34be4a5018
2012-02-23 07:53:15 -06:00
Ben Steffensmeier
06c9d4cdcf
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 8b906b245fd927ed79825b00dfba456a1c327fbb
2012-02-22 17:40:48 -06:00
Bryan Kowal
9a63901c0e
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 979af119b4da4e99e0ee2f090b9c28c02db7f7a3
2012-02-22 17:07:15 -06:00
Steve Harris
a7b68a50be
creating OB12.2.1 from ss_sync for testing
...
Former-commit-id: 5ea9539870491d7ea3d1a050b700a17d18ecee1d
2012-02-22 13:06:47 -06:00
Steve Harris
c8aae98741
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
94c2ea985b
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
84926c80be
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: fe86fe3696731660f6b37a147194c670906cdf4f
2012-02-21 10:37:36 -06:00
Nate Jensen
b90611d995
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: ac8ad6fa074f715a4b53a66fc41267a70ccb90f8
2012-02-21 08:57:12 -06:00
Steve Harris
7be1fb41ea
Merge branch 'ss_sync'
...
Former-commit-id: b1c075b5f5af7df5058a409622a59b7d13b36416
2012-02-20 16:51:00 -06:00
Steve Harris
b89ebc5e01
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 85082f273a85a3967d54d4a489b6ea973d0688be
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
69e8cde115
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: e0f697c492eecff4bb8d83d05efbcaf2876125c9
2012-02-20 15:28:20 -06:00
Steve Harris
eca4aef9a8
Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added
Former-commit-id: d74a1285a30ce98a656668c93c71462e7dc51c2a
2012-02-20 14:02:14 -06:00
Steve Harris
07bf1f770d
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 80817ea48545c3315d8445c9acae60b6c92088f7
2012-02-20 13:04:10 -06:00
Steve Harris
cabf9fd956
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: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
2012-02-20 13:03:39 -06:00
Steve Harris
6a064cb78b
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
2012-02-20 12:54:25 -06:00
Steve Harris
4b76d22f77
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Steve Harris
62c587b841
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: aaf3d445f517bba03e9f6b768850f2a8c77d26ed
2012-02-20 07:49:13 -06:00
Bryan Kowal
10a0ca252d
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
2012-02-17 12:17:14 -06:00
Bryan Kowal
4276fc2fe8
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: 1ec51accade835c1133eac9222131f9186985053
2012-02-17 11:09:13 -06:00
Steve Harris
93f6535bd8
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
26d82729c9
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 04a68e6815001450fece9bb5fbf6ce99143e2d05
2012-02-16 16:36:56 -06:00
Steve Harris
e2989d1a9f
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: d3ca90194ff9d361ba9ff7679c2f4da43a439de4
2012-02-16 14:23:01 -06:00
Nate Jensen
bdb08a9f4c
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
...
Former-commit-id: 712f278a25a67d3d05375213b4d5bc8e7743aaa9
2012-02-16 14:00:33 -06:00
Bryan Kowal
c8dba08a9d
Issue #34 - recompiled the nsharp dll with the latest ncep code.
...
Former-commit-id: d3affc909e299af8826d16bc02754fc61754e287
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
28c7e6bc22
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: cb03ef54be5e9dae57d758903f6956a8c2a9a617
2012-02-15 17:10:34 -06:00
Steve Harris
2783331dd6
Merge commit 'awips2_OB12.1.1_Omaha'
...
Former-commit-id: b1bce76fd8170d05e57624f969e5293c1257c533
2012-02-15 15:45:23 -06:00
Steve Harris
64b3ba9d2b
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 7b981a7bb3e35d9147bf686150e5ed91e5b22d79
2012-02-15 15:09:30 -06:00
Steve Harris
272ba87883
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 14c8ac5618aa04da5408a1d75297f3f9fa19d023
2012-02-15 15:08:58 -06:00
Steve Harris
b9f4780fcb
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: 0c520ee63a42d53754686f52ffa5b94a0fe4eea1
2012-02-15 14:39:43 -06:00
Steve Harris
7356d655da
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
2012-02-15 14:34:47 -06:00
Steve Harris
05c0347d90
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
...
Former-commit-id: f83e2bd22a74e9604fb878a899d9a2df5fbb28eb
2012-02-15 14:26:22 -06:00
Steve Harris
5e47f8c33a
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: ab787c94408e85afe2d92c3f860b7b9bd271c616
2012-02-15 12:54:54 -06:00
Bryan Kowal
38eb4bd2b6
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: 1dd23c4dea214938fe9660f303458c5f08efdc01
2012-02-15 10:31:58 -06:00
Steve Harris
2119a1513e
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
2012-02-14 15:54:46 -06:00
Steve Harris
7a28b5ea62
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
...
Former-commit-id: 70f1516d0cc4dcd62214453974f1e65dd57d1ddd
2012-02-14 15:47:32 -06:00
Ben Steffensmeier
944e59e989
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: 518db101f2ec18afa31a5b12fbaab3bbb903013b
2012-02-14 15:46:11 -06:00
Steve Harris
3973ed2360
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
...
Former-commit-id: e8e020e3bd86ffcd918366990d605acee8bd6a80
2012-02-14 15:41:54 -06:00
Ben Steffensmeier
97000f0738
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
...
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 78deeca92b5916c7c57b1f866e9be2e11992c13d
2012-02-14 15:39:50 -06:00
