Bryan Kowal
|
4e53eadca4
|
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly f79134499e [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]]
Former-commit-id: f79134499e
Former-commit-id: f01648537abdc924d90c96168fabc6a20dc2d827 [formerly 1acbc16759]
Former-commit-id: 872a3a5f60
|
2012-06-20 11:22:58 -05:00 |
|
Nate Jensen
|
eac2ca80d3
|
Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
Former-commit-id: 6b03c17c02 [formerly bc63d08489] [formerly e620f1c65a9fcb3e64e4f6527852b8fc01785022 [formerly f74233956e]] [formerly a8af268ca1 [formerly f74233956e [formerly dd1f52c8e5d36cccab98821018cb77f544529933]]]
Former-commit-id: a8af268ca1
Former-commit-id: c5258bd2f8fa1dab44cd1cdd93077e9b78bf7725 [formerly 7376a1d4ff]
Former-commit-id: 6b9344db87
|
2012-06-19 16:47:34 -05:00 |
|
Bryan Kowal
|
dcb8a248f9
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 345f682e22 [formerly a1ba6c10be] [formerly e32406ca8a] [formerly a4c6095b76 [formerly e32406ca8a [formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]]
Former-commit-id: a4c6095b76
Former-commit-id: 85539ae32db819c9b82455e5e760e9e64caf1669 [formerly 3b2d570834]
Former-commit-id: 76afa5d4b6
|
2012-06-19 13:17:17 -05:00 |
|
Bryan Kowal
|
181cd0b024
|
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: d25012ee75 [formerly cb16805e7e] [formerly 95a5887b06] [formerly 25e20ad89c [formerly 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: f43b37604ae27b981a3dbd819486fddea450376c [formerly fd8be91fed]
Former-commit-id: 5db24885ba
|
2012-06-19 13:15:53 -05:00 |
|
Max Schenkelberg
|
a2918fa349
|
Issue #440 made PathManager not request data if there are no contexts to request for
Former-commit-id: 116c64cbc4 [formerly 1e8e9db9eb] [formerly e856cfedf4] [formerly db57eeee16 [formerly e856cfedf4 [formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]]
Former-commit-id: db57eeee16
Former-commit-id: 6016b63b4bbe43e962ce98ea3f0b4e92a20d477e [formerly 1f10cddfa2]
Former-commit-id: 15c59d6621
|
2012-06-19 13:00:44 -05:00 |
|
Nate Jensen
|
21872217ff
|
Issue #765 fix so data can be retrieved with or without hdfFileId
Former-commit-id: f930006834 [formerly 619b70f7fc] [formerly ae384ddf24] [formerly bb1ea105d2 [formerly ae384ddf24 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]]
Former-commit-id: bb1ea105d2
Former-commit-id: ee6822d87212c2fe60739255b82ed1d9cd41f416 [formerly 244ca1b88b]
Former-commit-id: d7841cef54
|
2012-06-18 17:20:48 -05:00 |
|
Bryan Kowal
|
ac72941bf0
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]
Former-commit-id: 21e8618852
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
c26fb13e2d
|
Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api.
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23
Former-commit-id: 3c4dbe4316 [formerly e629fcb15b] [formerly f63d2bc7c2] [formerly dd353747d0 [formerly f63d2bc7c2 [formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]]
Former-commit-id: dd353747d0
Former-commit-id: a88a43be924ea2a9703409b12a89d3312a78044d [formerly af82c0a52a]
Former-commit-id: 6e66b88dd5
|
2012-06-14 16:30:34 -05:00 |
|
Bryan Kowal
|
3d127ee45f
|
Issue #708 - support deploying from a separate work assignment repository - initial implementation.
Former-commit-id: 11a4550eb3 [formerly 24627d52f2] [formerly 1c8b752063] [formerly 14c912f215 [formerly 1c8b752063 [formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]]
Former-commit-id: 14c912f215
Former-commit-id: ad3fc2affc79c43708d17ae13d41eaa4609a8718 [formerly c1b57d1de1]
Former-commit-id: 4a631c01ee
|
2012-06-14 12:43:34 -05:00 |
|
Bryan Kowal
|
81fa46c01a
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly c0aaac4a07 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]
Former-commit-id: c0aaac4a07
Former-commit-id: 1adfac8f38f065227cc081b4143843fe19b3f856 [formerly c608fc959c]
Former-commit-id: a9c2cf4fae
|
2012-06-14 11:35:15 -05:00 |
|
Ron Anderson
|
50fa58d036
|
Removed activetable plugin dependencies on gfe
Former-commit-id: 9b93354368 [formerly 6720a0aa77] [formerly be525f1c49] [formerly a8d2c6b961 [formerly be525f1c49 [formerly 1b923c335dd69dfa5a95972f1aa749cf5497bcee]]]
Former-commit-id: a8d2c6b961
Former-commit-id: a0f65e1d33e360005b0b4f457fdfd9d44972bf37 [formerly c241585248]
Former-commit-id: 89b8a935c4
|
2012-06-14 10:09:22 -05:00 |
|
Max Schenkelberg
|
ea948bbb82
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a]
Former-commit-id: f0d2893e97
|
2012-06-13 17:52:11 -05:00 |
|
Steve Harris
|
6c0d8be39e
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]
Former-commit-id: d7a4853091
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
d5c94ccef2
|
12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]
Former-commit-id: b69fa75919
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
471fa3ac04
|
12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]
Former-commit-id: 32c0464d79
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
cd017cbb21
|
12.5.1-15 baseline
Former-commit-id: 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]
Former-commit-id: cee20d8656
Former-commit-id: 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a]
Former-commit-id: 31d7649939
|
2012-06-11 16:02:30 -05:00 |
|
Steve Harris
|
5e0e2d2c48
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]
Former-commit-id: 23c34c469a
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
1f521a70b3
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
64e44d4a74
|
Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822
Former-commit-id: 7ae9376eb0 [formerly 1d9ccb6bd3] [formerly fde1e68df6] [formerly 052cc81223 [formerly fde1e68df6 [formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]]
Former-commit-id: 052cc81223
Former-commit-id: 9c9fd2fe958ad90f7350440a18275599b07f8a98 [formerly d4dcc0e12e]
Former-commit-id: 86f03dfdc3
|
2012-05-31 16:05:25 -05:00 |
|
David Gillingham
|
c4330c67df
|
Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.
Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e
Former-commit-id: 46fbfbfeb5 [formerly ff34c58b1b] [formerly 09dcd35e4a] [formerly db75f1860b [formerly 09dcd35e4a [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]]
Former-commit-id: db75f1860b
Former-commit-id: f7afd5d624653b95848fcb61d09be11d28dfd125 [formerly 6efe780ad6]
Former-commit-id: f1343b9a6e
|
2012-05-24 14:54:17 -05:00 |
|
David Gillingham
|
0f2ea852c0
|
Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.
Former-commit-id: 343f42b325 [formerly 855745db06] [formerly 95e1582a22] [formerly 34303477ac [formerly 95e1582a22 [formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]]
Former-commit-id: 34303477ac
Former-commit-id: b60770ef8afdb543546f259cf39a697319e6bd73 [formerly 9dabcca4f8]
Former-commit-id: 031558955d
|
2012-05-23 15:49:49 -05:00 |
|
Steve Harris
|
dbedcc229c
|
12.5.1-9 baseline
Former-commit-id: 45773fbee0 [formerly b8de76b45e] [formerly 8f3c9ebfb7] [formerly 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]
Former-commit-id: 1f542697cb
Former-commit-id: 7f45c65c47eed82c8ae433d59f2e859d5e1df5a0 [formerly ce0422a34a]
Former-commit-id: d23b0e4d60
|
2012-05-21 17:48:55 -05:00 |
|
David Gillingham
|
ecd4a38f1d
|
Issue #649: Make compression of archived Java objects optional.
Former-commit-id: 173f110759 [formerly 513d0e6280] [formerly 05a58dadf1] [formerly 28bdf26f2e [formerly 05a58dadf1 [formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]]]
Former-commit-id: 28bdf26f2e
Former-commit-id: 3c92cf8d75938c1b8f2275e81faa2c0c0ce0d249 [formerly f5fe7e6be7]
Former-commit-id: f58f89dce7
|
2012-05-21 16:48:02 -05:00 |
|
David Gillingham
|
40a1b95aae
|
Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.
Change-Id: I3689e003e367be2b69033f13f1744c381d597616
Former-commit-id: c11202e8a2 [formerly 32799c46d2] [formerly 94a4cbd107] [formerly 7c84c67c67 [formerly 94a4cbd107 [formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]]
Former-commit-id: 7c84c67c67
Former-commit-id: 161e67d1bd498003c78fb1e4f4808adf3a46bb50 [formerly 8d877d7784]
Former-commit-id: f3ac7a8090
|
2012-05-21 13:10:10 -05:00 |
|
David Gillingham
|
61484252c3
|
Issue #646: Ensure radar obs use TimeTools to set reftime.
Former-commit-id: 84bcf0cf3e [formerly f12f83c80b] [formerly 4f9061fcea] [formerly 091e0325ea [formerly 4f9061fcea [formerly c6c83792c753be9c248e951462830983d5a3ee2e]]]
Former-commit-id: 091e0325ea
Former-commit-id: 4cbe2b3e0dc80a6b0a868d4f3978074c9e90390e [formerly ea06b163b9]
Former-commit-id: e779d44a4e
|
2012-05-18 16:31:16 -05:00 |
|
David Gillingham
|
0b28847c7c
|
Issue #643: Fix regression to ProfilerObs.setPointDataView() from issue
538.
Former-commit-id: a831cac423 [formerly 9106c31a45] [formerly 3b1ab25b17] [formerly 49fe4c42a6 [formerly 3b1ab25b17 [formerly 353ea05b777d0a239101132abf4c869b75243b6e]]]
Former-commit-id: 49fe4c42a6
Former-commit-id: 6db397a65d3b474015e29dafa712de22ef57f937 [formerly 2a3b400c3c]
Former-commit-id: aae96ea26c
|
2012-05-18 10:49:01 -05:00 |
|
Max Schenkelberg
|
bb967c048d
|
Issue #639 Cleaned up chat logging a bit
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32
Former-commit-id: 615f473537 [formerly fdcc024dd7] [formerly d9c1499311] [formerly dce9ee1905 [formerly d9c1499311 [formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]]]
Former-commit-id: dce9ee1905
Former-commit-id: cda09cf250021e8845e9c2f429c6b92286637753 [formerly f6e74cc027]
Former-commit-id: 6723e813e6
|
2012-05-17 13:58:33 -05:00 |
|
Brad Gonzales
|
b12ceef75e
|
Issue #639 added collaboration chat logging to localization.
Former-commit-id: af28cc55ae [formerly 954324a221] [formerly 5935fd7091] [formerly 892b6d83e5 [formerly 5935fd7091 [formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]]]
Former-commit-id: 892b6d83e5
Former-commit-id: 8e52ca80018c089cf1ff50afb512f63c53300f7c [formerly 06ebcfb533]
Former-commit-id: aa71750482
|
2012-05-17 12:13:30 -05:00 |
|
Steve Harris
|
bc695ee025
|
12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly ffae06aa7059ba46bdf5d6194d790ed5d3513713 [formerly 24474489f9]] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]
Former-commit-id: 4792884ab2
|
2012-05-16 16:41:22 -05:00 |
|
Max Schenkelberg
|
c5a6acfedb
|
Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad
Former-commit-id: 3cff79f5e9 [formerly 193bc7e249] [formerly 1ca2a9ce13] [formerly 0e5fd5cd15 [formerly 1ca2a9ce13 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: 91754fe9fa71f33b72a85b7c2a6da5b65a021772 [formerly b764f03353]
Former-commit-id: 25b9975bc3
|
2012-05-16 15:01:41 -05:00 |
|
Ron Anderson
|
2008d8979b
|
Issue #502 Fix staticTopo notifications
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1
Former-commit-id: 0cd6bac8a0 [formerly 5461b92346] [formerly 902bde0f2d] [formerly cd0fd140ad [formerly 902bde0f2d [formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]]]
Former-commit-id: cd0fd140ad
Former-commit-id: b6aa71bef0833aacf1d6f6f6df2595f37af04536 [formerly 3018275239]
Former-commit-id: 72ee9f490d
|
2012-05-11 10:06:29 -05:00 |
|
Benjamin Phillippe
|
585db5f22d
|
Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9
Former-commit-id: d358d7caf4 [formerly 272323baa6] [formerly bd0e56daaf] [formerly 16f7fbe9cb [formerly bd0e56daaf [formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]]]
Former-commit-id: 16f7fbe9cb
Former-commit-id: 5d26eb84a976d14d7cdbfa54c783d5f28cdab3a9 [formerly acf8c7290f]
Former-commit-id: 953f50718c
|
2012-05-11 10:06:18 -05:00 |
|
Richard Peter
|
7a54b09c59
|
Issue #502: Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: 7a5aea8ee4 [formerly 7b14c9499a] [formerly e431671ff2] [formerly 150d16b24e [formerly e431671ff2 [formerly a4450314db26948d531ecf80ec1455895cdb81ac]]]
Former-commit-id: 150d16b24e
Former-commit-id: 3f705bea746413ee0cdfbbd18f2ab0a94a522dc8 [formerly 33c7d4cb87]
Former-commit-id: fe6dc2652c
|
2012-05-11 10:06:04 -05:00 |
|
Max Schenkelberg
|
985ee5a034
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01]
Former-commit-id: 2db836b296
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
fe7ac96625
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
43f936900c
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]
Former-commit-id: 9c9e01dbda
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
8025cc609e
|
12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]
Former-commit-id: f6300cd995
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
3992b18e28
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
40aa780b3d
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
|
2012-05-01 18:06:13 -05:00 |
|
Dave Hladky
|
9ae2445f9f
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]
Former-commit-id: a1a3a361dd
|
2012-04-30 13:43:34 -05:00 |
|
David Gillingham
|
576e994c04
|
Merge "Issue #562: Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge
Former-commit-id: ddd78ed32f [formerly 0ff2041959] [formerly 2c9c0b316aaf92bc0ffe380d32f526e9d027ef82 [formerly 4aadd41fde]] [formerly 9878793618 [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]]
Former-commit-id: 9878793618
Former-commit-id: 2346b8754f4ea785e03af9338a964fe9ccdfe0d2 [formerly a1a62aa8f1]
Former-commit-id: 8c4eda7ae7
|
2012-04-27 13:26:37 -05:00 |
|
David Gillingham
|
eeb836f5eb
|
Issue #562: Rename QPFRecord getters and setters to match Java-naming
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]
Former-commit-id: 292374ce21
Former-commit-id: 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]
Former-commit-id: 1107eac65d
|
2012-04-27 12:43:04 -05:00 |
|
Richard Peter
|
51e9a72371
|
Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 231d98b79e [formerly c33a392a8c] [formerly 349adaeedd] [formerly b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]
Former-commit-id: b11df888d3
Former-commit-id: 8e9c6244c73799f26e260982a3f71ee5ca3d5c9a [formerly e3323febc5]
Former-commit-id: ae35c2f27c
|
2012-04-27 12:08:29 -05:00 |
|
Max Schenkelberg
|
24fb2b356b
|
Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a31ad22113 [formerly 2cc5794428] [formerly a912786429] [formerly f74b6b4a93 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 8c89c3d5f0f25a3c5cb1d95eb759b2d2e999dff8 [formerly 2d25e8bb78]
Former-commit-id: 7bb4057d32
|
2012-04-25 17:28:52 -05:00 |
|
David Gillingham
|
7bf4680605
|
Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: be0570d2fe [formerly 8592a9a50d] [formerly 526abfd36e] [formerly 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]]
Former-commit-id: 04ab5d619b
Former-commit-id: e77f5dcec02d5b45fb66c367e20ce30bd24262be [formerly 36717c7a3e]
Former-commit-id: cf74c74cc2
|
2012-04-25 17:08:21 -05:00 |
|
Steve Harris
|
caab7c1fbb
|
12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]
Former-commit-id: 97caaa0327
|
2012-04-24 15:38:29 -05:00 |
|
Steve Harris
|
55b2a4df32
|
12.4.1-7 baseline
Former-commit-id: 98c92073b5 [formerly 6d585942fe] [formerly 90ae4bbb36] [formerly cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]]
Former-commit-id: cca73b3c62
Former-commit-id: e1236b435e1110728cc2c913cb89b44372ea9903 [formerly d9f966008c]
Former-commit-id: 4c88c0ae6c
|
2012-04-24 15:24:39 -05:00 |
|
Max Schenkelberg
|
0b1e9de1a3
|
Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: a2d730a537 [formerly 34f80169fe] [formerly f4193b0e4e] [formerly 32ade1a1f7 [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]]
Former-commit-id: 32ade1a1f7
Former-commit-id: d99b1b8e424819aa687ea38c079bbd2a3d08bf34 [formerly 1ddbb3ef60]
Former-commit-id: 2248b6ba00
|
2012-04-24 13:44:16 -05:00 |
|
Nate Jensen
|
49d8f6c799
|
Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 36c4c4e66e [formerly 14f70d1122] [formerly a4b0addeee] [formerly 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 529b68b96d852df4ba7ded4f9d68e14a00cc3e18 [formerly 8130c22b64]
Former-commit-id: 83e6f5acf4
|
2012-04-23 11:23:22 -05:00 |
|
David Gillingham
|
102d8422bd
|
Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61
Former-commit-id: 715dce7557 [formerly 30d5e0d2dd] [formerly bdbc16d31c] [formerly 58e7a0f310 [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]]
Former-commit-id: 58e7a0f310
Former-commit-id: ff55759d39974cfeacc3f63affe868b26ce230a0 [formerly 5850d4cfb1]
Former-commit-id: e8fdf9d48f
|
2012-04-19 17:10:08 -05:00 |
|