Commit graph

2435 commits

Author SHA1 Message Date
Nate Jensen
6441290b40 Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: a4eb19fc79 [formerly 9acda0b9f2] [formerly a4eb19fc79 [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: e41f57da67 [formerly a6be904c69]
Former-commit-id: e83a828209
2013-11-14 13:29:30 -06:00
Nate Jensen
abf56dec05 Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: 8df2c48648 [formerly 8cf1b752e0] [formerly 8df2c48648 [formerly 8cf1b752e0] [formerly b1d376e238 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]
Former-commit-id: b1d376e238
Former-commit-id: b0cfb6e836 [formerly 645e816d5d]
Former-commit-id: 983afa0eea
2013-11-12 16:48:32 -06:00
Nate Jensen
ec0025a309 Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 6707d1aadf [formerly 692ea76d75] [formerly 6707d1aadf [formerly 692ea76d75] [formerly a4ece1d116 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]
Former-commit-id: a4ece1d116
Former-commit-id: 4b329513e5 [formerly 2e86520b53]
Former-commit-id: 5c7be238a0
2013-11-12 13:02:49 -06:00
Brad Gonzales
a626b240ce Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 62e4cafa27 [formerly 8f70fb1d0c] [formerly 62e4cafa27 [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]
Former-commit-id: aea0e847aa
Former-commit-id: 7747d901f7 [formerly 866a11a9f0]
Former-commit-id: bad9b3242a
2013-11-12 12:42:16 -06:00
Nate Jensen
273eb805c0 Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 2c0c20f01e [formerly b52bdb1cec] [formerly 2c0c20f01e [formerly b52bdb1cec] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 9bf83be7e9 [formerly 5427e68fd2]
Former-commit-id: 80c38e1433
2013-11-12 10:37:54 -06:00
Steve Harris
b8cf485614 Merge branch 'omaha_13.5.3' into development
Former-commit-id: 51af205d06 [formerly 9dabbc7b8e] [formerly 51af205d06 [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]]
Former-commit-id: 66f99f3974
Former-commit-id: 48997c36f0 [formerly 9f1d93a2cf]
Former-commit-id: 92cf79a7cc
2013-11-11 15:40:45 -06:00
Steve Harris
889db4bc7b 13.5.3-7 baseline
Former-commit-id: 36af5686bd [formerly 21bed95fa4] [formerly 36af5686bd [formerly 21bed95fa4] [formerly 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]]]
Former-commit-id: 47102ee47b
Former-commit-id: 142f1201b3 [formerly 3599d7f09b]
Former-commit-id: 0c54c50443
2013-11-11 16:33:51 -05:00
Steve Harris
32ed33056b 13.5.3-6 baseline
Former-commit-id: 11ca17a63c [formerly 77a45660d5] [formerly 11ca17a63c [formerly 77a45660d5] [formerly 5fa893d37b [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]]
Former-commit-id: 5fa893d37b
Former-commit-id: 8705c4779b [formerly f31112871c]
Former-commit-id: 49b0919cf0
2013-11-11 12:34:10 -05:00
Max Schenkelberg
7383be61c1 Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 2f794486e3 [formerly e58a5df04b] [formerly 2f794486e3 [formerly e58a5df04b] [formerly bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]
Former-commit-id: bd903f6641
Former-commit-id: 3f3b244b0d [formerly c85532a180]
Former-commit-id: 60616f7ef0
2013-11-11 11:09:00 -06:00
Nate Jensen
82306d6f55 Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 040f022e5d [formerly 7a27264094] [formerly 040f022e5d [formerly 7a27264094] [formerly 08441efbb7 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]]
Former-commit-id: 08441efbb7
Former-commit-id: 399265e3f8 [formerly 4958732cb2]
Former-commit-id: 7a70c5ecce
2013-11-08 12:37:26 -06:00
Nate Jensen
7ce7a168ec Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: 058c963aa2 [formerly ec319b7dd0] [formerly 058c963aa2 [formerly ec319b7dd0] [formerly 43bbf31347 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]]
Former-commit-id: 43bbf31347
Former-commit-id: 8a27263b0c [formerly 5ecde78b02]
Former-commit-id: f836fe065e
2013-11-08 10:38:11 -06:00
Richard Peter
103448070d Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: 44818e3dbd [formerly 214a72ac69] [formerly 44818e3dbd [formerly 214a72ac69] [formerly bb0dcf6d4a [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: 990053c1fb [formerly 1909b0d06b]
Former-commit-id: 7725d0ee3e
2013-11-08 10:35:41 -06:00
Slav Korolev
976e7eb56c Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: 2d002ccde3 [formerly 59d1de165d] [formerly 2d002ccde3 [formerly 59d1de165d] [formerly 7b7754982c [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]]
Former-commit-id: 7b7754982c
Former-commit-id: 53b6d4aa69 [formerly c4a633acde]
Former-commit-id: 52807d248b
2013-11-08 11:09:21 -05:00
Nate Jensen
a1ac54a09c Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: bfc7c671cc [formerly 88eb0aab5c] [formerly bfc7c671cc [formerly 88eb0aab5c] [formerly 10548cd1c7 [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]]
Former-commit-id: 10548cd1c7
Former-commit-id: 13f93cd7cf [formerly 48a479d2dc]
Former-commit-id: fc79c7053d
2013-11-08 09:42:09 -06:00
Ron Anderson
bc734d5611 Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: c611ab48be [formerly 12192b633f] [formerly c611ab48be [formerly 12192b633f] [formerly c1bda09fd9 [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]]
Former-commit-id: c1bda09fd9
Former-commit-id: 6636ebeb2d [formerly d2cd7c1257]
Former-commit-id: 4e8df8ea5b
2013-11-07 14:39:06 -06:00
Ron Anderson
cc95af7fa8 Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 0bfd9a1c98 [formerly a5bc64473a] [formerly 0bfd9a1c98 [formerly a5bc64473a] [formerly 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]
Former-commit-id: 42229b8eee
Former-commit-id: 9d56a36dbe [formerly 6442e2e933]
Former-commit-id: 298f4abbae
2013-11-07 14:38:39 -06:00
Richard Peter
94e0faa6c6 Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
2013-11-07 14:25:45 -06:00
Nate Jensen
03911b4ce8 Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: a52e7b677f [formerly d4b6ad1eee] [formerly a52e7b677f [formerly d4b6ad1eee] [formerly cc2998b487 [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]
Former-commit-id: cc2998b487
Former-commit-id: 286c7a8b1c [formerly ce583a88fb]
Former-commit-id: 57f237693e
2013-11-07 11:44:07 -06:00
David Gillingham
be9ed341f5 Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 3df38a8d41 [formerly e1df69e312] [formerly 3df38a8d41 [formerly e1df69e312] [formerly 0e74638eb2 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 1ed80f471c [formerly d0b188d577]
Former-commit-id: 50f9ad420b
2013-11-07 11:36:49 -06:00
Nate Jensen
acccf2c827 Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: b01d5b16e0 [formerly f5feb9330f] [formerly b01d5b16e0 [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: c27c435cea [formerly 1b7ac545f8]
Former-commit-id: acec588299
2013-11-07 10:21:42 -06:00
Bryan Kowal
8fb72374e9 13.5.3 build "fix"
Former-commit-id: 503762af19 [formerly 6692b985f3] [formerly 503762af19 [formerly 6692b985f3] [formerly a28133117c [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]
Former-commit-id: a28133117c
Former-commit-id: cdf643510a [formerly ce6d80409d]
Former-commit-id: b04aa07437
2013-11-06 18:25:10 -06:00
Nate Jensen
f9be4065ec Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]
Former-commit-id: 1da0e31b88
Former-commit-id: 048d52722f [formerly aef895c447]
Former-commit-id: 0ae0e070c9
2013-11-06 17:07:10 -06:00
Bryan Kowal
bdc76d27b2 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 0f104b0365 [formerly 4f1c083032] [formerly 0f104b0365 [formerly 4f1c083032] [formerly bb15605aa2 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]
Former-commit-id: bb15605aa2
Former-commit-id: 0b006511dc [formerly 0bc8cdc9be]
Former-commit-id: 46616c32eb
2013-11-06 15:57:14 -06:00
Lee Venable
3cc206a34f Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 326e4e31a7 [formerly 8585080cd1] [formerly 326e4e31a7 [formerly 8585080cd1] [formerly 20726d4e7c [formerly 13672783e6a5e452cb4105669a98708329b35541]]]
Former-commit-id: 20726d4e7c
Former-commit-id: 9a8a813cf8 [formerly 0c4566c411]
Former-commit-id: 5627ef0cc8
2013-11-06 15:42:40 -06:00
Max Schenkelberg
53363b9bf7 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: d7c8b8f662 [formerly 3369fbec2d] [formerly d7c8b8f662 [formerly 3369fbec2d] [formerly c28fd2b38d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]
Former-commit-id: c28fd2b38d
Former-commit-id: e4b7f3618c [formerly d53db3ddb6]
Former-commit-id: 751b8f2315
2013-11-06 15:07:18 -06:00
Richard Peter
f39e0c68c0 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: b4a0f11c66 [formerly 27aa0dd6ba] [formerly b4a0f11c66 [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]
Former-commit-id: 6ccb444219
Former-commit-id: 6b8bea4af5 [formerly f4bdb0caea]
Former-commit-id: b52c9482ea
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
925d8bca38 Issue #2493 remove mesowest.
Former-commit-id: f761c701cf [formerly d0b7966458] [formerly f761c701cf [formerly d0b7966458] [formerly 36916fedcd [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]
Former-commit-id: 36916fedcd
Former-commit-id: 5d31aad5c2 [formerly baebe37ba6]
Former-commit-id: afe014af99
2013-11-06 13:42:38 -06:00
Slav Korolev
a2e60dbe60 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: cc90a7af4b [formerly 076865bb61] [formerly cc90a7af4b [formerly 076865bb61] [formerly c25204d75b [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]
Former-commit-id: c25204d75b
Former-commit-id: 8fbf625667 [formerly 3223cd19cd]
Former-commit-id: b8ebc9ac63
2013-11-06 14:38:55 -05:00
Roger Ferrel
8533c6e67c Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784

Former-commit-id: f198c27f3f [formerly 07a7dd63c3] [formerly f198c27f3f [formerly 07a7dd63c3] [formerly e01b524542 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]
Former-commit-id: e01b524542
Former-commit-id: d10ffdcca7 [formerly 274d52a694]
Former-commit-id: df1dc51d0d
2013-11-06 13:13:02 -06:00
Richard Peter
463f09984a Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c

Former-commit-id: 15fd2f7a55 [formerly f3d8768b94] [formerly 15fd2f7a55 [formerly f3d8768b94] [formerly c09f68615c [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]
Former-commit-id: c09f68615c
Former-commit-id: 1b65a09a52 [formerly a653f9625a]
Former-commit-id: 3c129fb138
2013-11-06 13:09:32 -06:00
Mike Duff
4cede401ec Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: 65f9da04a9 [formerly e1180868e7] [formerly 65f9da04a9 [formerly e1180868e7] [formerly 35c4911e7e [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]
Former-commit-id: 35c4911e7e
Former-commit-id: e1b9c9daa8 [formerly 7e28ffcaad]
Former-commit-id: 39dda9d18c
2013-11-06 12:00:04 -06:00
Ben Steffensmeier
5cf9a6ed01 Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 4639cd69f4 [formerly 5b53cb4c98] [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: b64221f27b [formerly 8aefe5ff02]
Former-commit-id: a97ec9b8e5
2013-11-05 17:33:41 -06:00
Nate Jensen
f15331607d Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141

Former-commit-id: 27f09b8096 [formerly 6064000389] [formerly 27f09b8096 [formerly 6064000389] [formerly b36d28c9fd [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]
Former-commit-id: b36d28c9fd
Former-commit-id: 5d2ec98600 [formerly 3e3400dc7c]
Former-commit-id: 27b1f123f0
2013-11-04 14:30:00 -06:00
Ben Steffensmeier
dacf863d66 Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: d386c6bc76 [formerly ff5f08d23a] [formerly d386c6bc76 [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: d38879158d [formerly 08e73de883]
Former-commit-id: a0f4c08cfd
2013-11-04 13:01:49 -06:00
Lee Venable
ade7b14670 Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: bfc83fa74e [formerly 0b3346d699] [formerly bfc83fa74e [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: c7d03bf267 [formerly f6f1b16c0c]
Former-commit-id: 52da34fc55
2013-11-02 10:43:48 -05:00
Slav Korolev
e4a2b6d619 Issue #2431. Changed labels on the table.
Former-commit-id: 8874f76878 [formerly dd1ff63737] [formerly 8874f76878 [formerly dd1ff63737] [formerly 0801f8dedd [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 6b3481ca26 [formerly 7d0198b356]
Former-commit-id: f8e429a1b9
2013-11-01 15:06:19 -04:00
Steve Harris
90f27a16c9 13.5.3-4 baseline
Former-commit-id: 0ee69293ec [formerly 8aeae1c481] [formerly 0ee69293ec [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]
Former-commit-id: da7d1ce05e
Former-commit-id: 7454b37d59 [formerly b8d3fd62d0]
Former-commit-id: 8f9b121f90
2013-11-01 14:20:00 -04:00
Ron Anderson
638b57e188 Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: a15c620fc8 [formerly 9e9dd04bfd] [formerly a15c620fc8 [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]
Former-commit-id: cc991ed528
Former-commit-id: f453d92818 [formerly deb89a88f5]
Former-commit-id: 84adff8e96
2013-11-01 11:07:39 -05:00
Slav Korolev
884ca2167c Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: feb9d8db5a [formerly 7ca47690af] [formerly feb9d8db5a [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]
Former-commit-id: f7d1939b36
Former-commit-id: fcbe5d09da [formerly 386db59985]
Former-commit-id: 57fc9a2183
2013-11-01 11:03:06 -04:00
Nate Jensen
3858434dc3 Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: b986638bc5 [formerly 43b2f50a0a] [formerly b986638bc5 [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 6ed6df6ed0 [formerly 47fc100053]
Former-commit-id: 6164feb2da
2013-10-31 18:11:13 -05:00
David Gillingham
4862c1d171 Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af

Former-commit-id: f404f1560c [formerly 6e1cca2966] [formerly f404f1560c [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 3776f258a3 [formerly 3bac577a31]
Former-commit-id: 5df42898ad
2013-10-31 14:07:20 -05:00
Ben Steffensmeier
a92af46f59 Issue #2491 Fix collaboration Xml.
Former-commit-id: a5f970e238 [formerly 3d36cec7be] [formerly a5f970e238 [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 89c999410e [formerly 49ffb7e92c]
Former-commit-id: a0e805ded6
2013-10-31 14:06:37 -05:00
Ron Anderson
49ea9c0444 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: b61ccc1609 [formerly 38e33092a2] [formerly b61ccc1609 [formerly 38e33092a2] [formerly 42e924e021 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: 2f23072e41 [formerly eef9d2dfb0]
Former-commit-id: e3a0440825
2013-10-31 14:04:55 -05:00
Nate Jensen
3c1f343be5 Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: b17891ba0e [formerly ccf3d5b1e9] [formerly b17891ba0e [formerly ccf3d5b1e9] [formerly de50a9214b [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]
Former-commit-id: de50a9214b
Former-commit-id: c9d9070600 [formerly d6fcc98e76]
Former-commit-id: c24d8c63cd
2013-10-31 12:24:23 -05:00
Steve Harris
ef72863e6f 13.5.3-3 baseline
Former-commit-id: 883ad32443 [formerly baa036cd62] [formerly 883ad32443 [formerly baa036cd62] [formerly 1503847a4b [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: a58b825dde [formerly 6b879b2465]
Former-commit-id: 5be6e21405
2013-10-31 12:52:07 -04:00
Richard Peter
ab890140fb Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 5048d010f5 [formerly 3139055873] [formerly 5048d010f5 [formerly 3139055873] [formerly b482eb2b48 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: fca3d73aa7 [formerly 73462fa134]
Former-commit-id: 300f907c46
2013-10-31 11:46:25 -05:00
Mike Duff
5ff3fe2791 Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: c1bd170f8a [formerly f123fa11f5] [formerly c1bd170f8a [formerly f123fa11f5] [formerly 3fc811102e [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: b0c54d7c17 [formerly 4da0648461]
Former-commit-id: 26ca1b4d72
2013-10-31 09:22:50 -05:00
Steve Harris
e90722d781 13.5.3-2 baseline
Former-commit-id: c6d951b390 [formerly 055783655b] [formerly c6d951b390 [formerly 055783655b] [formerly 6d85d944a6 [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 0c17777164 [formerly aef0e828d2]
Former-commit-id: 1cc13c9992
2013-10-30 12:53:25 -04:00
David Gillingham
75acd532a1 Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: c58160c9a9 [formerly 297fd6c3d4] [formerly c58160c9a9 [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 68b0b2e3db [formerly 996817f124]
Former-commit-id: eef2c93d6c
2013-10-30 11:34:46 -05:00
Ben Steffensmeier
02b9133d50 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: e15fecc459 [formerly 5b395f7417] [formerly e15fecc459 [formerly 5b395f7417] [formerly 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 78efdb7572 [formerly 418c259567]
Former-commit-id: 9d87eb50e2
2013-10-29 17:35:55 -05:00