Nate Jensen
aaf15c2354
Issue #765 fix so data can be retrieved with or without hdfFileId
...
Former-commit-id: f930006834
[formerly 619b70f7fc
] [formerly ae384ddf24
] [formerly f930006834
[formerly 619b70f7fc
] [formerly ae384ddf24
] [formerly bb1ea105d2
[formerly ae384ddf24
[formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]]]
Former-commit-id: bb1ea105d2
Former-commit-id: 21872217ff
[formerly d7841cef54
] [formerly ee6822d87212c2fe60739255b82ed1d9cd41f416 [formerly 244ca1b88b
]]
Former-commit-id: 30ddaf4d3253d037ec108181694224c138cd9300 [formerly 31160b8485
]
Former-commit-id: 05a77b1536
2012-06-18 17:20:48 -05:00
Bryan Kowal
14f81556c3
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 9e7907ecd7
[formerly 9361f3eb94
] [formerly f528e10391
] [formerly f0e3b957e3
[formerly f528e10391
[formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0
[formerly 21e8618852
] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71
]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b
]
Former-commit-id: a6d1f97dec
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
a2a5caf09e
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 3c4dbe4316
[formerly e629fcb15b
] [formerly f63d2bc7c2
] [formerly dd353747d0
[formerly f63d2bc7c2
[formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]]]
Former-commit-id: dd353747d0
Former-commit-id: c26fb13e2d
[formerly 6e66b88dd5
] [formerly a88a43be924ea2a9703409b12a89d3312a78044d [formerly af82c0a52a
]]
Former-commit-id: 048f9a0e928ca648df7f0fc8ea474047061190f0 [formerly 0bf066fc5e
]
Former-commit-id: 968a6fa7df
2012-06-14 16:30:34 -05:00
Bryan Kowal
91df3acbcb
Issue #708 - support deploying from a separate work assignment repository - initial implementation.
...
Former-commit-id: 11a4550eb3
[formerly 24627d52f2
] [formerly 1c8b752063
] [formerly 11a4550eb3
[formerly 24627d52f2
] [formerly 1c8b752063
] [formerly 14c912f215
[formerly 1c8b752063
[formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]]]
Former-commit-id: 14c912f215
Former-commit-id: 3d127ee45f
[formerly 4a631c01ee
] [formerly ad3fc2affc79c43708d17ae13d41eaa4609a8718 [formerly c1b57d1de1
]]
Former-commit-id: d3b71e55a89d4a65b680452640ce9512b2c10cf4 [formerly b730eced02
]
Former-commit-id: 19f8cca72c
2012-06-14 12:43:34 -05:00
Bryan Kowal
3d94c3e332
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 175cbf318d
[formerly 5e80c45a03
] [formerly dcc5675564
] [formerly c0aaac4a07
[formerly dcc5675564
[formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]]
Former-commit-id: c0aaac4a07
Former-commit-id: 81fa46c01a
[formerly a9c2cf4fae
] [formerly 1adfac8f38f065227cc081b4143843fe19b3f856 [formerly c608fc959c
]]
Former-commit-id: cd07c27f5f551d77046fbda54bdadaa0fe56e393 [formerly 720a152a45
]
Former-commit-id: eca1d3d525
2012-06-14 11:35:15 -05:00
Ron Anderson
2dcd35d0e5
Removed activetable plugin dependencies on gfe
...
Former-commit-id: 9b93354368
[formerly 6720a0aa77
] [formerly be525f1c49
] [formerly 9b93354368
[formerly 6720a0aa77
] [formerly be525f1c49
] [formerly a8d2c6b961
[formerly be525f1c49
[formerly 1b923c335dd69dfa5a95972f1aa749cf5497bcee]]]]
Former-commit-id: a8d2c6b961
Former-commit-id: 50fa58d036
[formerly 89b8a935c4
] [formerly a0f65e1d33e360005b0b4f457fdfd9d44972bf37 [formerly c241585248
]]
Former-commit-id: bfb601ee51669305bc9b5de533c77da5df465cda [formerly 40689a68e9
]
Former-commit-id: 89d19595b4
2012-06-14 10:09:22 -05:00
Max Schenkelberg
e773643f7a
Issue #697 added support for multiple editors
...
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c4
[formerly 51c2a41e68
] [formerly dd99479eeb
] [formerly 816500d7c4
[formerly 51c2a41e68
] [formerly dd99479eeb
] [formerly fceef3c5a1
[formerly dd99479eeb
[formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]]
Former-commit-id: fceef3c5a1
Former-commit-id: ea948bbb82
[formerly f0d2893e97
] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a
]]
Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c
]
Former-commit-id: 7bac48f643
2012-06-13 17:52:11 -05:00
Steve Harris
ec9204fa94
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 03383359f3
[formerly af6c0529ad
] [formerly 2f20a86a30
] [formerly 48860df690
[formerly 2f20a86a30
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e
[formerly d7a4853091
] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd
]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f
]
Former-commit-id: 70a928d039
2012-06-12 14:37:12 -05:00
Steve Harris
b54ad5af66
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 975053c3dc
[formerly c7024992a3
] [formerly 37793c86b1
] [formerly d325d496f5
[formerly 37793c86b1
[formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48
[formerly 23c34c469a
] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213
]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2
]
Former-commit-id: c01b096242
2012-06-11 15:24:03 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Max Schenkelberg
b204fe5f11
Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
...
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822
Former-commit-id: 7ae9376eb0
[formerly 1d9ccb6bd3
] [formerly fde1e68df6
] [formerly 7ae9376eb0
[formerly 1d9ccb6bd3
] [formerly fde1e68df6
] [formerly 052cc81223
[formerly fde1e68df6
[formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]]]
Former-commit-id: 052cc81223
Former-commit-id: 64e44d4a74
[formerly 86f03dfdc3
] [formerly 9c9fd2fe958ad90f7350440a18275599b07f8a98 [formerly d4dcc0e12e
]]
Former-commit-id: d872a796d7cc0eaee9d104d2c0573a8afd609518 [formerly e2ebc0fb30
]
Former-commit-id: 648b22f31b
2012-05-31 16:05:25 -05:00
David Gillingham
b5707264ae
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 46fbfbfeb5
[formerly ff34c58b1b
] [formerly 09dcd35e4a
] [formerly db75f1860b
[formerly 09dcd35e4a
[formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]]]
Former-commit-id: db75f1860b
Former-commit-id: c4330c67df
[formerly f1343b9a6e
] [formerly f7afd5d624653b95848fcb61d09be11d28dfd125 [formerly 6efe780ad6
]]
Former-commit-id: 42f0bfbba80f23ad0b01bf6a3ddc91fdca285fc9 [formerly be3b7a994f
]
Former-commit-id: 7af4c62015
2012-05-24 14:54:17 -05:00
David Gillingham
4a34bc1de8
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 343f42b325
[formerly 855745db06
] [formerly 95e1582a22
] [formerly 34303477ac
[formerly 95e1582a22
[formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]]]
Former-commit-id: 34303477ac
Former-commit-id: 0f2ea852c0
[formerly 031558955d
] [formerly b60770ef8afdb543546f259cf39a697319e6bd73 [formerly 9dabcca4f8
]]
Former-commit-id: c13024cc350d0e7bf29490ff88e0a740efb36c03 [formerly 1e4fd039ef
]
Former-commit-id: bba1f5d494
2012-05-23 15:49:49 -05:00
David Gillingham
3fdae10940
Issue #649 : Make compression of archived Java objects optional.
...
Former-commit-id: 173f110759
[formerly 513d0e6280
] [formerly 05a58dadf1
] [formerly 173f110759
[formerly 513d0e6280
] [formerly 05a58dadf1
] [formerly 28bdf26f2e
[formerly 05a58dadf1
[formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]]]]
Former-commit-id: 28bdf26f2e
Former-commit-id: ecd4a38f1d
[formerly f58f89dce7
] [formerly 3c92cf8d75938c1b8f2275e81faa2c0c0ce0d249 [formerly f5fe7e6be7
]]
Former-commit-id: 7a3cdda248cceb6507f948757eb9a940be42da69 [formerly 6fe5d0cdaf
]
Former-commit-id: 2326b069c7
2012-05-21 16:48:02 -05:00
David Gillingham
13e96f02e1
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 c11202e8a2
[formerly 32799c46d2
] [formerly 94a4cbd107
] [formerly 7c84c67c67
[formerly 94a4cbd107
[formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]]]
Former-commit-id: 7c84c67c67
Former-commit-id: 40a1b95aae
[formerly f3ac7a8090
] [formerly 161e67d1bd498003c78fb1e4f4808adf3a46bb50 [formerly 8d877d7784
]]
Former-commit-id: 0c99a5b20a91764c5aa9876e2624b5d61aa60728 [formerly e048d60ff7
]
Former-commit-id: 99b80900e4
2012-05-21 13:10:10 -05:00
David Gillingham
46cfa12369
Issue #646 : Ensure radar obs use TimeTools to set reftime.
...
Former-commit-id: 84bcf0cf3e
[formerly f12f83c80b
] [formerly 4f9061fcea
] [formerly 84bcf0cf3e
[formerly f12f83c80b
] [formerly 4f9061fcea
] [formerly 091e0325ea
[formerly 4f9061fcea
[formerly c6c83792c753be9c248e951462830983d5a3ee2e]]]]
Former-commit-id: 091e0325ea
Former-commit-id: 61484252c3
[formerly e779d44a4e
] [formerly 4cbe2b3e0dc80a6b0a868d4f3978074c9e90390e [formerly ea06b163b9
]]
Former-commit-id: 212ccd94b290dd22b231f1f2badb09fb37fc5dbf [formerly c0f47ec357
]
Former-commit-id: c54aa59c17
2012-05-18 16:31:16 -05:00
David Gillingham
df8006173e
Issue #643 : Fix regression to ProfilerObs.setPointDataView() from issue
...
538.
Former-commit-id: a831cac423
[formerly 9106c31a45
] [formerly 3b1ab25b17
] [formerly a831cac423
[formerly 9106c31a45
] [formerly 3b1ab25b17
] [formerly 49fe4c42a6
[formerly 3b1ab25b17
[formerly 353ea05b777d0a239101132abf4c869b75243b6e]]]]
Former-commit-id: 49fe4c42a6
Former-commit-id: 0b28847c7c
[formerly aae96ea26c
] [formerly 6db397a65d3b474015e29dafa712de22ef57f937 [formerly 2a3b400c3c
]]
Former-commit-id: c5ba3c59aa09dd89dfcfc39ea7904770a2dc49ce [formerly cef3f07284
]
Former-commit-id: c8d7ae383d
2012-05-18 10:49:01 -05:00
Max Schenkelberg
bf641541e2
Issue #639 Cleaned up chat logging a bit
...
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32
Former-commit-id: 615f473537
[formerly fdcc024dd7
] [formerly d9c1499311
] [formerly 615f473537
[formerly fdcc024dd7
] [formerly d9c1499311
] [formerly dce9ee1905
[formerly d9c1499311
[formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]]]]
Former-commit-id: dce9ee1905
Former-commit-id: bb967c048d
[formerly 6723e813e6
] [formerly cda09cf250021e8845e9c2f429c6b92286637753 [formerly f6e74cc027
]]
Former-commit-id: c0e616a756b63c1256f20bef6ec8f920d57edb3f [formerly 1462e030ec
]
Former-commit-id: 6cbb7a0e8c
2012-05-17 13:58:33 -05:00
Brad Gonzales
a175efb8df
Issue #639 added collaboration chat logging to localization.
...
Former-commit-id: af28cc55ae
[formerly 954324a221
] [formerly 5935fd7091
] [formerly af28cc55ae
[formerly 954324a221
] [formerly 5935fd7091
] [formerly 892b6d83e5
[formerly 5935fd7091
[formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]]]]
Former-commit-id: 892b6d83e5
Former-commit-id: b12ceef75e
[formerly aa71750482
] [formerly 8e52ca80018c089cf1ff50afb512f63c53300f7c [formerly 06ebcfb533
]]
Former-commit-id: 40e3ced551c84fe109c0193c15fc396ef1270275 [formerly 0e79b46c23
]
Former-commit-id: 06a99fd702
2012-05-17 12:13:30 -05:00
Max Schenkelberg
85c39021ca
Issue #239 Added IShadedShape capability to remote target
...
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad
Former-commit-id: 3cff79f5e9
[formerly 193bc7e249
] [formerly 1ca2a9ce13
] [formerly 3cff79f5e9
[formerly 193bc7e249
] [formerly 1ca2a9ce13
] [formerly 0e5fd5cd15
[formerly 1ca2a9ce13
[formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: c5a6acfedb
[formerly 25b9975bc3
] [formerly 91754fe9fa71f33b72a85b7c2a6da5b65a021772 [formerly b764f03353
]]
Former-commit-id: 7a1838cada7072affd1e8201b4976a5b59f5f23f [formerly 3d58fb358e
]
Former-commit-id: bc6563c49f
2012-05-16 15:01:41 -05:00
Ron Anderson
64661eb663
Issue #502 Fix staticTopo notifications
...
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1
Former-commit-id: 0cd6bac8a0
[formerly 5461b92346
] [formerly 902bde0f2d
] [formerly 0cd6bac8a0
[formerly 5461b92346
] [formerly 902bde0f2d
] [formerly cd0fd140ad
[formerly 902bde0f2d
[formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]]]]
Former-commit-id: cd0fd140ad
Former-commit-id: 2008d8979b
[formerly 72ee9f490d
] [formerly b6aa71bef0833aacf1d6f6f6df2595f37af04536 [formerly 3018275239
]]
Former-commit-id: b7b55db50c4c4a30656e52f87c0192a3eb480f5d [formerly a4d75e7f03
]
Former-commit-id: b4c6c15831
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
8e0e4169e0
Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
...
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9
Former-commit-id: d358d7caf4
[formerly 272323baa6
] [formerly bd0e56daaf
] [formerly d358d7caf4
[formerly 272323baa6
] [formerly bd0e56daaf
] [formerly 16f7fbe9cb
[formerly bd0e56daaf
[formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]]]]
Former-commit-id: 16f7fbe9cb
Former-commit-id: 585db5f22d
[formerly 953f50718c
] [formerly 5d26eb84a976d14d7cdbfa54c783d5f28cdab3a9 [formerly acf8c7290f
]]
Former-commit-id: 02edef7d2730d62c72e9dd1d0ac3ad6f9b07e8e2 [formerly 0f7b8cb09c
]
Former-commit-id: 3077dc053a
2012-05-11 10:06:18 -05:00
Richard Peter
b58b1e4d17
Issue #502 : Update grib/gfe thread/memory usage for grib notification route
...
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: 7a5aea8ee4
[formerly 7b14c9499a
] [formerly e431671ff2
] [formerly 7a5aea8ee4
[formerly 7b14c9499a
] [formerly e431671ff2
] [formerly 150d16b24e
[formerly e431671ff2
[formerly a4450314db26948d531ecf80ec1455895cdb81ac]]]]
Former-commit-id: 150d16b24e
Former-commit-id: 7a54b09c59
[formerly fe6dc2652c
] [formerly 3f705bea746413ee0cdfbbd18f2ab0a94a522dc8 [formerly 33c7d4cb87
]]
Former-commit-id: ce6b25f9296038bffefa627ffe2c780c6f57bcde [formerly 74059dfbe2
]
Former-commit-id: b6c398257d
2012-05-11 10:06:04 -05:00
Max Schenkelberg
2d167af343
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b
[formerly 06ee0bbf6f
] [formerly 78e1bd2c62
] [formerly 82298cb03b
[formerly 06ee0bbf6f
] [formerly 78e1bd2c62
] [formerly 1f5abc6e20
[formerly 78e1bd2c62
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 985ee5a034
[formerly 2db836b296
] [formerly 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01
]]
Former-commit-id: ae5df9ba1774095dd47fab5b8b61888b552632fc [formerly 6cd18a09dc
]
Former-commit-id: 5729c0acc5
2012-05-09 15:02:30 -05:00
Steve Harris
2f6ae50479
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 fc70139990
[formerly d7f7c26582
] [formerly 092efd6072
] [formerly 31b3e87ffa
[formerly 092efd6072
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625
[formerly 53d2822329
] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8
]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560
]
Former-commit-id: d040b14742
2012-05-09 13:19:47 -05:00
Steve Harris
c76fddc7e4
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 bcc12e03ed
[formerly 572e1bb476
] [formerly 27bc369818
] [formerly 58037cb5d1
[formerly 27bc369818
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c
[formerly 9c9e01dbda
] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7
]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640
]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
3419f72215
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 fe946166ed
[formerly 4ec294b525
] [formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28
[formerly 7c7fc97131
] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809
]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35
]
Former-commit-id: 491aa53a0c
2012-05-01 18:31:09 -05:00
Steve Harris
7f90924706
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d
[formerly 33a67cdd82
] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5
]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86
]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Dave Hladky
8f500ff6d6
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 37da8763eb
[formerly 42a12fa7a5
] [formerly 1b7473572f
] [formerly 37da8763eb
[formerly 42a12fa7a5
] [formerly 1b7473572f
] [formerly 5b7ecea866
[formerly 1b7473572f
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]]
Former-commit-id: 5b7ecea866
Former-commit-id: 9ae2445f9f
[formerly a1a3a361dd
] [formerly d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff
]]
Former-commit-id: 07953e4b449645e4adcfef80f1595ec0513eb00f [formerly d2e16d486b
]
Former-commit-id: 7fc0c65ef4
2012-04-30 13:43:34 -05:00
David Gillingham
c14b933aac
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 4aadd41fde
] [formerly ddd78ed32f
[formerly 0ff2041959
] [formerly 4aadd41fde
] [formerly 9878793618
[formerly 4aadd41fde
[formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]]]
Former-commit-id: 9878793618
Former-commit-id: 576e994c04
[formerly 8c4eda7ae7
] [formerly 2346b8754f4ea785e03af9338a964fe9ccdfe0d2 [formerly a1a62aa8f1
]]
Former-commit-id: 7427d8ebfd4376ec5b3ce31ace2d1e11fa2556d5 [formerly dfc4e92f58
]
Former-commit-id: 8b91ca3fb5
2012-04-27 13:26:37 -05:00
David Gillingham
d189b66b1f
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 034cab5000
[formerly 6497272c1d
] [formerly c28bfaddee
] [formerly 292374ce21
[formerly c28bfaddee
[formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]]
Former-commit-id: 292374ce21
Former-commit-id: eeb836f5eb
[formerly 1107eac65d
] [formerly 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1
]]
Former-commit-id: e167e02e805072fdf1b2f36d3706605647061458 [formerly 01f74fa2b5
]
Former-commit-id: 64df9d3b46
2012-04-27 12:43:04 -05:00
Richard Peter
b7c5a834b5
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 231d98b79e
[formerly c33a392a8c
] [formerly 349adaeedd
] [formerly 231d98b79e
[formerly c33a392a8c
] [formerly 349adaeedd
] [formerly b11df888d3
[formerly 349adaeedd
[formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]]
Former-commit-id: b11df888d3
Former-commit-id: 51e9a72371
[formerly ae35c2f27c
] [formerly 8e9c6244c73799f26e260982a3f71ee5ca3d5c9a [formerly e3323febc5
]]
Former-commit-id: 0fa5241fd917758f0896a74d045990ac166bd25b [formerly 0212d3108f
]
Former-commit-id: 83564a4dde
2012-04-27 12:08:29 -05:00
Max Schenkelberg
8fafc768ae
Added network logging for http traffic
...
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a31ad22113
[formerly 2cc5794428
] [formerly a912786429
] [formerly a31ad22113
[formerly 2cc5794428
] [formerly a912786429
] [formerly f74b6b4a93
[formerly a912786429
[formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 24fb2b356b
[formerly 7bb4057d32
] [formerly 8c89c3d5f0f25a3c5cb1d95eb759b2d2e999dff8 [formerly 2d25e8bb78
]]
Former-commit-id: 1141c5a73ef20b9b2e65c981fb05a96c27b88f21 [formerly 936fa688c0
]
Former-commit-id: cd7fe895bc
2012-04-25 17:28:52 -05:00
David Gillingham
86bd3050dc
Issue #473 : Properly archive text plugin records,
...
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: be0570d2fe
[formerly 8592a9a50d
] [formerly 526abfd36e
] [formerly be0570d2fe
[formerly 8592a9a50d
] [formerly 526abfd36e
] [formerly 04ab5d619b
[formerly 526abfd36e
[formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]]]
Former-commit-id: 04ab5d619b
Former-commit-id: 7bf4680605
[formerly cf74c74cc2
] [formerly e77f5dcec02d5b45fb66c367e20ce30bd24262be [formerly 36717c7a3e
]]
Former-commit-id: 9bbbf2a7ff6b6837a7d45fdfda006aba43507cc8 [formerly aeba62a5d9
]
Former-commit-id: 84d7341a01
2012-04-25 17:08:21 -05:00
Max Schenkelberg
74b3843b34
Issue #239 Added persistence capability to Collaboration data events
...
Former-commit-id: a2d730a537
[formerly 34f80169fe
] [formerly f4193b0e4e
] [formerly a2d730a537
[formerly 34f80169fe
] [formerly f4193b0e4e
] [formerly 32ade1a1f7
[formerly f4193b0e4e
[formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 0b1e9de1a3
[formerly 2248b6ba00
] [formerly d99b1b8e424819aa687ea38c079bbd2a3d08bf34 [formerly 1ddbb3ef60
]]
Former-commit-id: 405c9af2dd5c82d700f3e510eed67e2a35c20334 [formerly 836eec0684
]
Former-commit-id: f07147578f
2012-04-24 13:44:16 -05:00
Nate Jensen
b930b25977
Issue #443 better logging of traffic
...
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 36c4c4e66e
[formerly 14f70d1122
] [formerly a4b0addeee
] [formerly 36c4c4e66e
[formerly 14f70d1122
] [formerly a4b0addeee
] [formerly 39ebbc3913
[formerly a4b0addeee
[formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 49d8f6c799
[formerly 83e6f5acf4
] [formerly 529b68b96d852df4ba7ded4f9d68e14a00cc3e18 [formerly 8130c22b64
]]
Former-commit-id: a83d2bb5a6626f09d2951421f7552384f89a7fdc [formerly 776ef738f7
]
Former-commit-id: 2bce81c6c8
2012-04-23 11:23:22 -05:00
David Gillingham
b3332b11bf
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 715dce7557
[formerly 30d5e0d2dd
] [formerly bdbc16d31c
] [formerly 58e7a0f310
[formerly bdbc16d31c
[formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]]]
Former-commit-id: 58e7a0f310
Former-commit-id: 102d8422bd
[formerly e8fdf9d48f
] [formerly ff55759d39974cfeacc3f63affe868b26ce230a0 [formerly 5850d4cfb1
]]
Former-commit-id: 4b2c95a7187d74cbbaf13ae3aeabb2b9741c4291 [formerly 7fa9358be9
]
Former-commit-id: 1be4f67cbb
2012-04-19 17:10:08 -05:00
Bryan Kowal
f3fc0d0c89
Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
...
Former-commit-id: dbcc538fa8
[formerly 72068507a9
] [formerly b1561d67a0
] [formerly dbcc538fa8
[formerly 72068507a9
] [formerly b1561d67a0
] [formerly b90b6f101e
[formerly b1561d67a0
[formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]]]
Former-commit-id: b90b6f101e
Former-commit-id: 562a5377f0
[formerly 0514785b3a
] [formerly 8c618e7da663f49943d266edd03a91c9b60e6eb4 [formerly a9b51192d2
]]
Former-commit-id: 791fcbd072a534d67245c9440c80f6ea097a6365 [formerly a610f40857
]
Former-commit-id: e14e8e473e
2012-04-19 13:09:58 -05:00
Steve Harris
0cf19dc505
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
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
Former-commit-id: 634d40a156
[formerly 63f11892e8
] [formerly 4d7572a632
] [formerly 634d40a156
[formerly 63f11892e8
] [formerly 4d7572a632
] [formerly 625cd4262c
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae
[formerly e86dc647be
] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d
]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d
]
Former-commit-id: 9b8c6e395d
2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Max Schenkelberg
48b3aa1ef6
Issue #239 Added wireframe shape capability
...
Former-commit-id: 9b8f9de1fa
[formerly 7900e78944
] [formerly 12dcb4b044
] [formerly 9b8f9de1fa
[formerly 7900e78944
] [formerly 12dcb4b044
] [formerly 5be2b4e745
[formerly 12dcb4b044
[formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]]]
Former-commit-id: 5be2b4e745
Former-commit-id: 6120d53cc0
[formerly 3e781ede4f
] [formerly ea1488b7dd2da24d9175bcf1e6e1bc795640ef82 [formerly f6a2f5e55c
]]
Former-commit-id: c93b11401aa9baa4f85b0b2e7780d92ad1c9a720 [formerly 12c672e400
]
Former-commit-id: 96a6f4f647
2012-04-12 14:46:08 -05:00
Steve Harris
80108c0af9
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd
[formerly c90ce9d54e
] [formerly ed26e06df2
] [formerly 6a1f2160bd
[formerly c90ce9d54e
] [formerly ed26e06df2
] [formerly fee53dea94
[formerly ed26e06df2
[formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34
[formerly 51bb9ebb46
] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648
]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860
]
Former-commit-id: f51d290333
2012-04-10 12:50:03 -05:00
Bryan Kowal
d484d46519
Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
...
Former-commit-id: 476ad5de1f
[formerly f49aadd9c8
] [formerly 1afa927c33
] [formerly 476ad5de1f
[formerly f49aadd9c8
] [formerly 1afa927c33
] [formerly 839d7c886f
[formerly 1afa927c33
[formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]]
Former-commit-id: 839d7c886f
Former-commit-id: 438e88cc58
[formerly ab70749ea4
] [formerly 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9
]]
Former-commit-id: 8311d4eb699b277f616ec522a0769d665dba89b5 [formerly adaa011b1f
]
Former-commit-id: 6f9a0e45cb
2012-04-09 09:32:45 -05:00
Bryan Kowal
db5981d4cd
Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
...
Former-commit-id: 4d73e617c8
[formerly 21ff4bf657
] [formerly f1e81b1a95
] [formerly 4d73e617c8
[formerly 21ff4bf657
] [formerly f1e81b1a95
] [formerly dcc3c7bb59
[formerly f1e81b1a95
[formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]]]
Former-commit-id: dcc3c7bb59
Former-commit-id: 0591ab00cc
[formerly 774d05de1b
] [formerly d309520ea9fa039612c8a81873e58c06eedee69b [formerly 240c3a1806
]]
Former-commit-id: 9f2d3acc4e68c9a863a54857e65a398b0ed2b8ba [formerly 64c328e151
]
Former-commit-id: 58a8ef45c0
2012-04-09 09:19:02 -05:00
David Gillingham
e188aaa21b
Issue #435 : Prevent NullPointerExceptions from being thrown when
...
serializing AirepRecords and NcAirepRecords.
Issue #435 : Address peer review comments on previous change.
Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac
Former-commit-id: 3b47db9541
[formerly 5193184abf
] [formerly 87142f9f4e
] [formerly 3b47db9541
[formerly 5193184abf
] [formerly 87142f9f4e
] [formerly e0e57577ff
[formerly 87142f9f4e
[formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]]
Former-commit-id: e0e57577ff
Former-commit-id: c39ee5a3c0
[formerly bef6e3d504
] [formerly f9200a739ae6f82c440eea10738de05476856c19 [formerly 84f0765dba
]]
Former-commit-id: 6c141db4a8da864d4f5448d844a3d1627ec7723d [formerly 3c0c8de495
]
Former-commit-id: 963a44fec9
2012-04-05 15:49:23 -05:00
Bryan Kowal
ad3d889f82
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
...
Former-commit-id: 5f9463bc57
[formerly 3e039dc79f
] [formerly e792b2a16f
] [formerly 5f9463bc57
[formerly 3e039dc79f
] [formerly e792b2a16f
] [formerly 2ed20e107d
[formerly e792b2a16f
[formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f24e7a4d31
[formerly edb7431d0a
] [formerly f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a
]]
Former-commit-id: 1f75c4defef522fcbd2e5b5755b3202c6dd96d6d [formerly 3db4653b1e
]
Former-commit-id: faefa46212
2012-04-04 18:29:13 -05:00
Bradley Gonzales
88c3278ffa
Issue #440 more descriptive login failure message
...
Former-commit-id: 9d44aabf06
[formerly 391f8e4d58
] [formerly 6fc14461ee
] [formerly 9d44aabf06
[formerly 391f8e4d58
] [formerly 6fc14461ee
] [formerly 74ce6f2140
[formerly 6fc14461ee
[formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 7945fe90e6
[formerly 2d7e2b456e
] [formerly 098005964c92d44ded39c3c5e5194fbf5527436a [formerly c345b2614e
]]
Former-commit-id: 1eddcc6965e7c22a1738f21ecef6183843d48aa4 [formerly 7a125d179c
]
Former-commit-id: 60d8ddce72
2012-04-04 16:26:58 -05:00
Max Schenkelberg
46ed965577
Issue #239 Start of remote target capabilities
...
Former-commit-id: 6e94ff6098
[formerly ac1fc79f5b
] [formerly 6c411ffb07
] [formerly 6e94ff6098
[formerly ac1fc79f5b
] [formerly 6c411ffb07
] [formerly d2d03e2c64
[formerly 6c411ffb07
[formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]]]
Former-commit-id: d2d03e2c64
Former-commit-id: 275030f23b
[formerly 3b9699d896
] [formerly 320620d9bdec1aae5cb62ad9138b5b802bf7ddf7 [formerly 5d7e504e89
]]
Former-commit-id: d641da94e0330770fad1285ac62698679e7102ef [formerly 522382bb0b
]
Former-commit-id: 5b50c04d63
2012-04-03 15:11:20 -05:00
David Gillingham
a325bc28ff
Issue #435 : Ensure associated HDF5 data is always captured when
...
archiving PDOs, alter binlightning so insert time is based on
system time like all other plugins.
Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2
Issue #435 : Add comment to previous change as requested by peer review, fix binlightning insert time.
Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2
Former-commit-id: ae703513d7
[formerly c9d5823d2c
] [formerly a9398fe4cd
] [formerly ae703513d7
[formerly c9d5823d2c
] [formerly a9398fe4cd
] [formerly e0e8e6d00a
[formerly a9398fe4cd
[formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]]]
Former-commit-id: e0e8e6d00a
Former-commit-id: 0fd14b8a0b
[formerly 4ff79099ac
] [formerly 0f166301c2c892f4b1314f13084e1d03103fbf79 [formerly b4439bc5e8
]]
Former-commit-id: 9454d16d102c26a98c3e6288eb24e36999eddc13 [formerly 4c01c6d66f
]
Former-commit-id: 16449705bf
2012-04-03 14:16:33 -05:00
Max Schenkelberg
fb2aac38df
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: 0b1caa67df
[formerly c56707c6bc
] [formerly 23d65caf2e
] [formerly 0b1caa67df
[formerly c56707c6bc
] [formerly 23d65caf2e
] [formerly 753de872e0
[formerly 23d65caf2e
[formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]]
Former-commit-id: 753de872e0
Former-commit-id: f3ff93f96f
[formerly c7165384f1
] [formerly adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae
]]
Former-commit-id: fd2fce7269f96cccd09b7c752b9ea972105488bb [formerly 5ebb709ef6
]
Former-commit-id: 8e521d2c29
2012-04-02 16:15:21 -05:00