Commit graph

263 commits

Author SHA1 Message Date
Steve Harris
91e65230ad 12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
ca8baf18a3 12.6.1-3 baseline
Former-commit-id: 42f3513175 [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: d57eb02b9e
Former-commit-id: 1fdc0aa237
2012-06-11 16:23:47 -05:00
Steve Harris
ad91dc8a2e 12.5.1-15 baseline
Former-commit-id: d5c238de07 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]
Former-commit-id: cee20d8656
Former-commit-id: 7da9afe36a
2012-06-11 16:02:30 -05:00
Steve Harris
3dd5b84aa2 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: 37793c86b1 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: d325d496f5
Former-commit-id: cf3c768213
2012-06-11 15:24:03 -05:00
Steve Harris
9054c5ab6c 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Max Schenkelberg
e2ebc0fb30 Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822

Former-commit-id: fde1e68df6 [formerly fde1e68df6 [formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]
Former-commit-id: 052cc81223
Former-commit-id: d4dcc0e12e
2012-05-31 16:05:25 -05:00
David Gillingham
be3b7a994f Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.

Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e

Former-commit-id: 09dcd35e4a [formerly 09dcd35e4a [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]
Former-commit-id: db75f1860b
Former-commit-id: 6efe780ad6
2012-05-24 14:54:17 -05:00
David Gillingham
1e4fd039ef Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.

Former-commit-id: 95e1582a22 [formerly 95e1582a22 [formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]
Former-commit-id: 34303477ac
Former-commit-id: 9dabcca4f8
2012-05-23 15:49:49 -05:00
Steve Harris
399c00d295 12.5.1-9 baseline
Former-commit-id: 8f3c9ebfb7 [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 1f542697cb
Former-commit-id: ce0422a34a
2012-05-21 17:48:55 -05:00
David Gillingham
6fe5d0cdaf Issue #649: Make compression of archived Java objects optional.
Former-commit-id: 05a58dadf1 [formerly 05a58dadf1 [formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]]
Former-commit-id: 28bdf26f2e
Former-commit-id: f5fe7e6be7
2012-05-21 16:48:02 -05:00
David Gillingham
e048d60ff7 Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.

Change-Id: I3689e003e367be2b69033f13f1744c381d597616

Former-commit-id: 94a4cbd107 [formerly 94a4cbd107 [formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]
Former-commit-id: 7c84c67c67
Former-commit-id: 8d877d7784
2012-05-21 13:10:10 -05:00
David Gillingham
c0f47ec357 Issue #646: Ensure radar obs use TimeTools to set reftime.
Former-commit-id: 4f9061fcea [formerly 4f9061fcea [formerly c6c83792c753be9c248e951462830983d5a3ee2e]]
Former-commit-id: 091e0325ea
Former-commit-id: ea06b163b9
2012-05-18 16:31:16 -05:00
David Gillingham
cef3f07284 Issue #643: Fix regression to ProfilerObs.setPointDataView() from issue
538.

Former-commit-id: 3b1ab25b17 [formerly 3b1ab25b17 [formerly 353ea05b777d0a239101132abf4c869b75243b6e]]
Former-commit-id: 49fe4c42a6
Former-commit-id: 2a3b400c3c
2012-05-18 10:49:01 -05:00
Max Schenkelberg
1462e030ec Issue #639 Cleaned up chat logging a bit
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32

Former-commit-id: d9c1499311 [formerly d9c1499311 [formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]]
Former-commit-id: dce9ee1905
Former-commit-id: f6e74cc027
2012-05-17 13:58:33 -05:00
Brad Gonzales
0e79b46c23 Issue #639 added collaboration chat logging to localization.
Former-commit-id: 5935fd7091 [formerly 5935fd7091 [formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]]
Former-commit-id: 892b6d83e5
Former-commit-id: 06ebcfb533
2012-05-17 12:13:30 -05:00
Steve Harris
2738af2019 12.5.1-6 baseline
Former-commit-id: 24474489f9 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
2012-05-16 16:41:22 -05:00
Max Schenkelberg
3d58fb358e Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad

Former-commit-id: 1ca2a9ce13 [formerly 1ca2a9ce13 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: b764f03353
2012-05-16 15:01:41 -05:00
Ron Anderson
a4d75e7f03 Issue #502 Fix staticTopo notifications
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1

Former-commit-id: 902bde0f2d [formerly 902bde0f2d [formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]]
Former-commit-id: cd0fd140ad
Former-commit-id: 3018275239
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
0f7b8cb09c Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9

Former-commit-id: bd0e56daaf [formerly bd0e56daaf [formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]]
Former-commit-id: 16f7fbe9cb
Former-commit-id: acf8c7290f
2012-05-11 10:06:18 -05:00
Richard Peter
74059dfbe2 Issue #502: Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36

Former-commit-id: e431671ff2 [formerly e431671ff2 [formerly a4450314db26948d531ecf80ec1455895cdb81ac]]
Former-commit-id: 150d16b24e
Former-commit-id: 33c7d4cb87
2012-05-11 10:06:04 -05:00
Max Schenkelberg
6cd18a09dc Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 78e1bd2c62 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 3ca8ca6f01
2012-05-09 15:02:30 -05:00
Steve Harris
7ee04eb560 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: 092efd6072 [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
7978d3b640 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: 27bc369818 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
2012-05-09 13:14:00 -05:00
Steve Harris
377ae76413 12.5.1-2 baseline
Former-commit-id: 84d191e7b6 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
fd9e226b35 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: 2ed7249613 [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
2012-05-01 18:31:09 -05:00
Steve Harris
e5543a0e86 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Dave Hladky
d2e16d486b Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 1b7473572f [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
2012-04-30 13:43:34 -05:00
David Gillingham
dfc4e92f58 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: 4aadd41fde [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]
Former-commit-id: 9878793618
Former-commit-id: a1a62aa8f1
2012-04-27 13:26:37 -05:00
David Gillingham
01f74fa2b5 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: c28bfaddee [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]
Former-commit-id: 292374ce21
Former-commit-id: 6f40ba77f1
2012-04-27 12:43:04 -05:00
Richard Peter
0212d3108f Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 349adaeedd [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: b11df888d3
Former-commit-id: e3323febc5
2012-04-27 12:08:29 -05:00
Max Schenkelberg
936fa688c0 Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25

Former-commit-id: a912786429 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]
Former-commit-id: f74b6b4a93
Former-commit-id: 2d25e8bb78
2012-04-25 17:28:52 -05:00
David Gillingham
aeba62a5d9 Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

Former-commit-id: 526abfd36e [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 04ab5d619b
Former-commit-id: 36717c7a3e
2012-04-25 17:08:21 -05:00
Steve Harris
3ed3a665cb 12.4.1-10 baseline
Former-commit-id: 704b75e1a1 [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 01457fbbde
Former-commit-id: aabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
5a3a53936f 12.4.1-7 baseline
Former-commit-id: 90ae4bbb36 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]
Former-commit-id: cca73b3c62
Former-commit-id: d9f966008c
2012-04-24 15:24:39 -05:00
Max Schenkelberg
836eec0684 Issue #239 Added persistence capability to Collaboration data events
Former-commit-id: f4193b0e4e [formerly f4193b0e4e [formerly 39e1cc313eae6df99483cc657c39cdd5e3d24533]]
Former-commit-id: 32ade1a1f7
Former-commit-id: 1ddbb3ef60
2012-04-24 13:44:16 -05:00
Nate Jensen
776ef738f7 Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: a4b0addeee [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]
Former-commit-id: 39ebbc3913
Former-commit-id: 8130c22b64
2012-04-23 11:23:22 -05:00
David Gillingham
7fa9358be9 Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61

Former-commit-id: bdbc16d31c [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]
Former-commit-id: 58e7a0f310
Former-commit-id: 5850d4cfb1
2012-04-19 17:10:08 -05:00
Bryan Kowal
a610f40857 Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: b1561d67a0 [formerly b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]
Former-commit-id: b90b6f101e
Former-commit-id: a9b51192d2
2012-04-19 13:09:58 -05:00
Steve Harris
19657ae52d 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: 4d7572a632 [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
2012-04-19 11:11:02 -05:00
Steve Harris
8cd5974f4c 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Max Schenkelberg
12c672e400 Issue #239 Added wireframe shape capability
Former-commit-id: 12dcb4b044 [formerly 12dcb4b044 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]
Former-commit-id: 5be2b4e745
Former-commit-id: f6a2f5e55c
2012-04-12 14:46:08 -05:00
Steve Harris
58cb18d860 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: ed26e06df2 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: fee53dea94
Former-commit-id: dcdd7f0648
2012-04-10 12:50:03 -05:00
Bryan Kowal
adaa011b1f 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: 1afa927c33 [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]
Former-commit-id: 839d7c886f
Former-commit-id: 24148c19a9
2012-04-09 09:32:45 -05:00
Bryan Kowal
64c328e151 Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: f1e81b1a95 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]
Former-commit-id: dcc3c7bb59
Former-commit-id: 240c3a1806
2012-04-09 09:19:02 -05:00
David Gillingham
3c0c8de495 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: 87142f9f4e [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]
Former-commit-id: e0e57577ff
Former-commit-id: 84f0765dba
2012-04-05 15:49:23 -05:00
Bryan Kowal
3db4653b1e 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: e792b2a16f [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: 2ed20e107d
Former-commit-id: 5f4d6f600a
2012-04-04 18:29:13 -05:00
Bradley Gonzales
7a125d179c Issue #440 more descriptive login failure message
Former-commit-id: 6fc14461ee [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]
Former-commit-id: 74ce6f2140
Former-commit-id: c345b2614e
2012-04-04 16:26:58 -05:00
Max Schenkelberg
522382bb0b Issue #239 Start of remote target capabilities
Former-commit-id: 6c411ffb07 [formerly 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]
Former-commit-id: d2d03e2c64
Former-commit-id: 5d7e504e89
2012-04-03 15:11:20 -05:00
David Gillingham
4c01c6d66f 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: a9398fe4cd [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]
Former-commit-id: e0e8e6d00a
Former-commit-id: b4439bc5e8
2012-04-03 14:16:33 -05:00
Max Schenkelberg
5ebb709ef6 Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: 23d65caf2e [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]
Former-commit-id: 753de872e0
Former-commit-id: e3477c90ae
2012-04-02 16:15:21 -05:00