Richard Peter
af1099b3fb
Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c
Former-commit-id: d262c02612b007d4a302
2013-06-24 18:51:56 -05:00
Richard Peter
a7594f8c93
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: 744eb6485637645245e5
2013-06-24 18:36:15 -05:00
Ron Anderson
6740c9e40f
Issue #2122 Fix the build
...
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a
Former-commit-id: f75554f1f7f06a8baf2d
2013-06-24 18:03:52 -05:00
Richard Peter
8481dd6bce
Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
...
Former-commit-id: 5f85aefff6a19a946a24
2013-06-24 17:20:10 -05:00
Max Schenkelberg
bc4ebb4f08
Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
...
Amend: Added fix for issue 2103
Amend: Added software history
Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b
Former-commit-id: 47b55981c82f03c38ca0
2013-06-24 15:48:37 -05:00
Bryan Kowal
7ebee00dc9
Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
...
Former-commit-id: 5b85217ca2cd2af684ca
2013-06-24 14:08:47 -05:00
Nate Jensen
a2c5c2a1a3
Merge "Issue #2122 Cleaned up dependencies for satellite" into development
...
Former-commit-id: 6541a89bf50479cea2e6
2013-06-24 09:12:12 -05:00
Nate Jensen
a44073cce6
Merge "Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests" into development
...
Former-commit-id: b1bd29e78469eec45f13
2013-06-24 09:10:01 -05:00
Steve Harris
810388f00a
13.5.1-3 baseline
...
Former-commit-id: 63803c142472d22a30c9
2013-06-24 09:29:43 -04:00
Mike Duff
65faaadc7c
Issue #2132 - Fix drawing lat/long box for madis point data
...
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96
Former-commit-id: f685e73bd214bd577f6c
2013-06-21 14:59:03 -05:00
Dave Hladky
57caa68867
Issue #2129 mkdirs call added to create directories at instantiation.
...
Change-Id: I163e3f832e04af17da8a18196a10b50d30b8c83d
Former-commit-id: 26398f6fb70544a0cf88
2013-06-21 11:13:04 -05:00
David Gillingham
8b7a998bbf
Issue #2111 : Prevent possible NullPointerException in GridCanvas's mouse
...
handler when attempting to display context menu.
Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee
Former-commit-id: 6b696c9e6a4f6c293a7e
2013-06-20 16:31:43 -05:00
Dustin Johnson
eaa3e47877
Issue #2106 Fix setting of data size on gridded subscriptions
...
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925
Former-commit-id: b486e5f2fe554b43807e
2013-06-20 16:00:08 -05:00
Dustin Johnson
d2faa3b600
Issue #1802 Fix event processing in regards to transaction commits/rollbacks
...
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22
Former-commit-id: ecae75ecd8a331cd2958
2013-06-20 13:53:04 -05:00
Dave Hladky
5d37e710d7
Issue #2120 Fixed SSL connection problem
...
Change-Id: I4a4e277ac75420bbaa621dcddb562e654211436c
Former-commit-id: ffc9dc1ac947d18e42ab
2013-06-20 12:51:30 -05:00
Ben Steffensmeier
69f1d9d812
Issue #2128 ensure setDataURI sets the dataURI.
...
Former-commit-id: f02b073cc868bb07f5fa
2013-06-20 11:11:37 -05:00
Lee Venable
9b564bef6a
Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1
...
Former-commit-id: 377bc28f638b92b564d5
2013-06-20 09:22:36 -05:00
Matt Nash
4fa399c710
Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests
...
Change-Id: I8ede8f8149be84e58d10d30066e08d3c80d543e5
Former-commit-id: 54a114d78999e9194921
2013-06-20 06:59:05 -05:00
Nate Jensen
622e1298d2
Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1
...
Former-commit-id: b7b2602271ba5c49fa61
2013-06-19 17:45:41 -05:00
Max Schenkelberg
959639d118
Issue #2122 Cleaned up dependencies for satellite
...
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e
Former-commit-id: 262d72b786c57439e5ef
2013-06-19 17:24:30 -05:00
Richard Peter
8c26fe8be2
Merge "Issue #2125 clean up AnnotationBinder warning" into development
...
Former-commit-id: 479ae9bf217eb4d39903
2013-06-19 16:41:39 -05:00
Richard Peter
fd3cdedf8e
Merge "Issue #1966 Check for modifications on close." into omaha_13.5.1
...
Former-commit-id: 36ed7d5d2b1fd38812ec
2013-06-19 16:41:27 -05:00
Ben Steffensmeier
accd308f8b
Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective.
...
Former-commit-id: 0e6f3ff5e66de9e86090
2013-06-19 16:35:41 -05:00
Roger Ferrel
440ea0fc25
Issue #2119 Added check when no selected lid.
...
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac
Former-commit-id: dc5059f06be7dc1184b1
2013-06-19 16:25:01 -05:00
Nate Jensen
bdda4a11d5
Issue #2125 clean up AnnotationBinder warning
...
Change-Id: I5cd92a9d82527c0b2f3dd68e0f79c10c2db98b0f
Former-commit-id: 3f1fc8b3672bcaafac83
2013-06-19 15:56:32 -05:00
Bryan Kowal
09c48506e7
Issue #1956 - dependency updates for EDEX dpa
...
- relocated certain localization files based on the plugins that used them; when more than one plugin used the localization it was
moved to the plugin that was a dependency of the other plugin that used it
- added the edex and common datadelivery service plugins to the core feature since there spring files are included in the dpa mode
Change-Id: Id1582abaa3e89a86289ce9ae615ac0997f60582d
Former-commit-id: 8f479a2536a877e9589c
2013-06-19 13:43:16 -05:00
Roger Ferrel
7c7b1264d1
Issue #2110 RequestRouter.route(req) changed the class returned.
...
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f
Former-commit-id: f3a1c68d404443dfd11a
2013-06-19 11:25:55 -05:00
Roger Ferrel
259a66ac85
Issue #1966 Check for modifications on close.
...
Change-Id: I88b17fb6406fd41ede46085a7a6b40149a387e83
Former-commit-id: 784a56f2ce67362de877
2013-06-19 11:09:44 -05:00
Dustin Johnson
235b75021b
Merge "Issue #1956 - spring changes for minimal EDEX DPA install." into development
...
Former-commit-id: de7d8fc9704993a17306
2013-06-19 10:37:02 -05:00
Nate Jensen
a9c077f0a9
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
...
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: 81fc4fa753c4283b0336
2013-06-19 10:16:06 -05:00
Dustin Johnson
dab308afc8
Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
...
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576
Former-commit-id: 6f8246262b314331c9a4
2013-06-19 08:56:43 -05:00
Dave Hladky
e466f536d0
Issue #2120 Updates to retrieval to fix time processing
...
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b
Former-commit-id: f2177d48f66110467a30
2013-06-19 08:35:50 -05:00
Bryan Kowal
5495e6e77f
Issue #1956 - spring changes for minimal EDEX DPA install.
...
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904
Former-commit-id: 2896039f9fa3736d3b87
2013-06-18 17:21:21 -05:00
Dustin Johnson
728f54c6ea
Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
...
Former-commit-id: 8d139f33252e1d54e686
2013-06-18 13:55:51 -05:00
Dave Hladky
7df10e06ae
Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed
...
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8
Former-commit-id: 235484e91d6ea9d25f9f
2013-06-18 13:40:02 -05:00
Dustin Johnson
50cb2e26a2
Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
...
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7
Former-commit-id: 9bc7c854ab7ee918a548
2013-06-18 12:34:25 -05:00
Nate Jensen
0873b84720
Merge "Issue #2100 - export EDEX_BITS earlier" into development
...
Former-commit-id: 572d9b7dc7c01eac48d9
2013-06-18 09:14:31 -05:00
Steve Harris
33bbec83ea
Merge branch 'omaha_13.5.1' into development
...
Former-commit-id: 1e5ef65d03cb95c711fd
2013-06-18 09:04:11 -05:00
Roger Ferrel
cc39af5044
Issue #1966 Column sort added; bug fixes to size estimates and saving files.
...
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa
Former-commit-id: f175b19a93c7c27c4cbb
2013-06-18 08:56:54 -05:00
Richard Peter
1d706b3b72
Issue #1977 : Fix merge, remove duplicate method alterProductParameters
...
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2
Former-commit-id: 9b8ef83ccb9f7739c7d5
2013-06-17 19:01:20 -05:00
Bryan Kowal
abd96b92b7
Issue #2100 - export EDEX_BITS earlier
...
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420
Former-commit-id: 0e01520e119b1596dc0c
2013-06-17 15:57:18 -05:00
Bryan Kowal
8f6b0fef1a
Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
...
Former-commit-id: cddb77b77b6d58e92913
2013-06-17 15:46:23 -05:00
Steve Harris
cb3e34813f
Merge branch 'omaha_13.5.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
Former-commit-id: 43316cbff9532d41787b
2013-06-17 15:29:01 -05:00
Steve Harris
41fb06e6ea
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Conflicts (self-resolved with kdiff3):
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
Former-commit-id: 97631f9c6240359c27c3
2013-06-17 15:25:32 -05:00
Steve Harris
3926dc20f7
13.5.1-2 baseline
...
Former-commit-id: adb779323d3386330894
2013-06-17 15:01:22 -04:00
Dustin Johnson
0e7a34ce2a
Merge "Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp" into omaha_13.5.1
...
Former-commit-id: 4b387ae85b46914a095c
2013-06-17 13:19:09 -05:00
Mike Duff
5c58b973ab
Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp
...
Former-commit-id: 2fa207f744e51778ae88
2013-06-17 13:15:34 -05:00
Steve Harris
eb16dd8a45
Issue #1977 - removed i386-pc-linux-gnu.tar (should have stayed removed since 13.4.1)
...
Former-commit-id: 477a86934cc5c8b4a121
2013-06-17 12:53:03 -05:00
Nate Jensen
0241ff964d
Merge "Issue #1924 - standardize build.properties files" into development
...
Former-commit-id: 41cb1a65523a18f54f1c
2013-06-17 12:31:19 -05:00
Dustin Johnson
ea165c6de6
Merge "Issue #2106 Correct connection password logic, fix test code" into development
...
Former-commit-id: 335888961fa61c26d0e4
2013-06-17 11:32:32 -05:00
