Commit graph

3035 commits

Author SHA1 Message Date
Bryan Kowal
0185fa1b02 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: 8f479a2536 [formerly 8f479a2536 [formerly 914587220cb65cb22b788a5bf1e867cdf53cf5bf]]
Former-commit-id: a877e9589c
Former-commit-id: 09c48506e7
2013-06-19 13:43:16 -05:00
Dustin Johnson
34313c9d20 Merge "Issue #1956 - spring changes for minimal EDEX DPA install." into development
Former-commit-id: de7d8fc970 [formerly de7d8fc970 [formerly 39973de8b36242d0a979e484e77822a68db289ed]]
Former-commit-id: 4993a17306
Former-commit-id: 235b75021b
2013-06-19 10:37:02 -05:00
Dave Hladky
039c7f6dec Issue #2120 Updates to retrieval to fix time processing
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b

Former-commit-id: f2177d48f6 [formerly f2177d48f6 [formerly 5686d945729c28407e16625548050937158f9c65]]
Former-commit-id: 6110467a30
Former-commit-id: e466f536d0
2013-06-19 08:35:50 -05:00
Bryan Kowal
224944e8bb Issue #1956 - spring changes for minimal EDEX DPA install.
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904

Former-commit-id: 2896039f9f [formerly 2896039f9f [formerly 66cfe69bb6653dd43a0740a87a55ad19fe74a362]]
Former-commit-id: a3736d3b87
Former-commit-id: 5495e6e77f
2013-06-18 17:21:21 -05:00
Dustin Johnson
1e95673d90 Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
Former-commit-id: 8d139f3325 [formerly 8d139f3325 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]
Former-commit-id: 2e1d54e686
Former-commit-id: 728f54c6ea
2013-06-18 13:55:51 -05:00
Dave Hladky
cc7beb263d Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8

Former-commit-id: 235484e91d [formerly 235484e91d [formerly 75a57b55a997db3edbf9829146b424b8da90cc77]]
Former-commit-id: 6ea9d25f9f
Former-commit-id: 7df10e06ae
2013-06-18 13:40:02 -05:00
Nate Jensen
0d01d191a5 Merge "Issue #2100 - export EDEX_BITS earlier" into development
Former-commit-id: 572d9b7dc7 [formerly 572d9b7dc7 [formerly 6ef49b301bd748d693f9f717ec186f2b5d0cd4ad]]
Former-commit-id: c01eac48d9
Former-commit-id: 0873b84720
2013-06-18 09:14:31 -05:00
Steve Harris
5343517c55 Merge branch 'omaha_13.5.1' into development
Former-commit-id: 1e5ef65d03 [formerly 1e5ef65d03 [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]
Former-commit-id: cb95c711fd
Former-commit-id: 33bbec83ea
2013-06-18 09:04:11 -05:00
Richard Peter
95bf734600 Issue #1977: Fix merge, remove duplicate method alterProductParameters
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2

Former-commit-id: 9b8ef83ccb [formerly 9b8ef83ccb [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 1d706b3b72
2013-06-17 19:01:20 -05:00
Bryan Kowal
5345a0ae10 Issue #2100 - export EDEX_BITS earlier
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: 0e01520e11 [formerly 0e01520e11 [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]
Former-commit-id: 9b1596dc0c
Former-commit-id: abd96b92b7
2013-06-17 15:57:18 -05:00
Bryan Kowal
fcaf57d316 Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
Former-commit-id: cddb77b77b [formerly cddb77b77b [formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]
Former-commit-id: 6d58e92913
Former-commit-id: 8f6b0fef1a
2013-06-17 15:46:23 -05:00
Steve Harris
316d2ec667 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: 43316cbff9 [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]
Former-commit-id: 532d41787b
Former-commit-id: cb3e34813f
2013-06-17 15:29:01 -05:00
Steve Harris
9c75ca8493 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: 97631f9c62 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]
Former-commit-id: 40359c27c3
Former-commit-id: 41fb06e6ea
2013-06-17 15:25:32 -05:00
Steve Harris
332a74c4de 13.5.1-2 baseline
Former-commit-id: adb779323d [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
2013-06-17 15:01:22 -04:00
Dustin Johnson
f01a1cee02 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: 4b387ae85b [formerly 4b387ae85b [formerly 8418598ba30fa601b13bbe435618acc1a6d152c2]]
Former-commit-id: 46914a095c
Former-commit-id: 0e7a34ce2a
2013-06-17 13:19:09 -05:00
Mike Duff
069d2134e2 Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp
Former-commit-id: 2fa207f744 [formerly 2fa207f744 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]
Former-commit-id: e51778ae88
Former-commit-id: 5c58b973ab
2013-06-17 13:15:34 -05:00
Steve Harris
e2d464b2be Issue #1977 - removed i386-pc-linux-gnu.tar (should have stayed removed since 13.4.1)
Former-commit-id: 477a86934c [formerly 477a86934c [formerly 1ce91abc2a3e4d12464e905e1d98ec4eb2179ca6]]
Former-commit-id: c5c8b4a121
Former-commit-id: eb16dd8a45
2013-06-17 12:53:03 -05:00
Nate Jensen
ef37f7c6ec Merge "Issue #1924 - standardize build.properties files" into development
Former-commit-id: 41cb1a6552 [formerly 41cb1a6552 [formerly 2f6157b0bfca10462e5df7a29205d571a1112b0b]]
Former-commit-id: 3a18f54f1c
Former-commit-id: 0241ff964d
2013-06-17 12:31:19 -05:00
Dustin Johnson
c56186f7ac Merge "Issue #2106 Correct connection password logic, fix test code" into development
Former-commit-id: 335888961f [formerly 335888961f [formerly 692965c3f516dd5fcb6aee2a96df88e94d2af323]]
Former-commit-id: a61c26d0e4
Former-commit-id: ea165c6de6
2013-06-17 11:32:32 -05:00
Lee Venable
542de44fbd Merge "Issue #2079 add dispose method to ModeListener" into development
Former-commit-id: 956a26aedc [formerly 956a26aedc [formerly f3619f573f102fcffd0503e0c0359e941568550f]]
Former-commit-id: af0a542f2f
Former-commit-id: 257de35a28
2013-06-17 11:19:34 -05:00
Ben Steffensmeier
02f80f3de5 Issue #2107 Enable sampling by default for several display types.
Former-commit-id: 2f21ec16f4 [formerly 2f21ec16f4 [formerly d8ede3a25fc352d12631a33b0a43f5e9ddf8fd27]]
Former-commit-id: b9d7e52fb8
Former-commit-id: b4e6c647a3
2013-06-17 10:35:28 -05:00
Dustin Johnson
ae0ad86a89 Issue #2106 Correct connection password logic, fix test code
Change-Id: I6f7f91542c324ac63214da5e231ab3f267b90f25

Former-commit-id: e1fb1488c9 [formerly e1fb1488c9 [formerly e1098a65c04a230590b8460b3da1d12b1046b9b5]]
Former-commit-id: 6cb4800e24
Former-commit-id: 57be281cb4
2013-06-17 09:24:07 -05:00
Dustin Johnson
87f733edc6 Merge "Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1" into development
Former-commit-id: eb03d30375 [formerly eb03d30375 [formerly 467d0aa52534f3c34cdcafc0fed7c08f414a4081]]
Former-commit-id: 867a55b56a
Former-commit-id: fa7ab9b2d7
2013-06-14 13:24:11 -05:00
Mike Duff
4205a90084 Issue #2108 - Refactor DataSizeUtils
Change-Id: I0e633fcd69edbbb25b930ac4797ae0934655bd0f

Former-commit-id: 532af54aae [formerly 532af54aae [formerly b6fffb21340d210a5a63d5f060f1dfe97b4868fb]]
Former-commit-id: 9d66579fb9
Former-commit-id: ed2ef22679
2013-06-14 12:30:11 -05:00
Dave Hladky
62a1b06b68 Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a

Former-commit-id: e48e4eeb69 [formerly e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]]
Former-commit-id: 752f7106bc
Former-commit-id: 608c43b64a
2013-06-14 12:29:08 -05:00
Dustin Johnson
52b0821df6 Merge "Issue #2106 Speed up Bandwidth Manager subscription scheduling" into development
Former-commit-id: f6d907556b [formerly f6d907556b [formerly 14156b01cb7e4e4250c9e74f4e21116ab9c706b0]]
Former-commit-id: 4f655f8690
Former-commit-id: 8d7a800600
2013-06-14 10:33:48 -05:00
Richard Peter
6851718b7e Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: bee6ba6698 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]
Former-commit-id: 8cdc6993d5
Former-commit-id: 20b7af86f6
2013-06-14 10:06:34 -05:00
Dustin Johnson
4735212532 Issue #2106 Speed up Bandwidth Manager subscription scheduling
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba

Former-commit-id: 2574f5a25d [formerly 2574f5a25d [formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]
Former-commit-id: 8500856bc1
Former-commit-id: b3cad4e40b
2013-06-14 09:25:48 -05:00
Bryan Kowal
9fa7363600 Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
Former-commit-id: 609c635703 [formerly 609c635703 [formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]
Former-commit-id: 772460c8ae
Former-commit-id: b94fa4b001
2013-06-14 08:05:03 -05:00
Dave Hladky
6f5039cb43 Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 776bbbba21 [formerly 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]
Former-commit-id: 5512104d86
Former-commit-id: b401764a23
2013-06-13 22:13:49 -05:00
Bryan Kowal
fb1cbdebfa Issue #1924 - standardize build.properties files
Former-commit-id: cebb5f8d5f [formerly cebb5f8d5f [formerly 739e93988616fefbb235ab3e023b7a7e0394b5e9]]
Former-commit-id: ec78ee1838
Former-commit-id: c5c6d1d4d4
2013-06-13 16:04:18 -05:00
Bryan Kowal
3ee84e116e Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database
Former-commit-id: 7ef3040d7a [formerly 7ef3040d7a [formerly 1187c6a5220952a7cd8a10361ff344b3d7a65a47]]
Former-commit-id: e31e16741c
Former-commit-id: fc25b8179f
2013-06-13 14:22:47 -05:00
Nate Jensen
853f5c7546 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: c2faa0e3bf [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2200c7cded
2013-06-13 11:39:30 -05:00
Bryan Kowal
1463a53721 Issue #1924 - add spring extensions to awips2-groovy
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: 180e01cf4c [formerly 180e01cf4c [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]
Former-commit-id: dbe58fa63d
Former-commit-id: 44740b014b
2013-06-13 11:18:23 -05:00
Roger Ferrel
09e36152db Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd

Former-commit-id: 753f19b309 [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]
Former-commit-id: a405684c7b
Former-commit-id: f64db73aef
2013-06-13 10:57:19 -05:00
Dustin Johnson
3a2f752a22 Issue #2090 Create Data Provider Agent feature
Amend: Remove dataplugins feature from dataprovideragent

Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901

Former-commit-id: e33cd9d00d [formerly e33cd9d00d [formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]
Former-commit-id: 45600f3d55
Former-commit-id: dfdfbe642b
2013-06-12 15:41:32 -05:00
Dustin Johnson
f6b7d97fd2 Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: 9156ec8c2d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]
Former-commit-id: 94eeac2f7d
Former-commit-id: c227436a3e
2013-06-12 14:52:49 -05:00
Nate Jensen
9b42439288 Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: 30f9bba5c4 [formerly 30f9bba5c4 [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]
Former-commit-id: 08eb034abc
Former-commit-id: 53784c5a86
2013-06-12 14:05:15 -05:00
Lee Venable
0c2e7515cd Merge "Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg." into development
Former-commit-id: c405328bb1 [formerly c405328bb1 [formerly f7e826e383dc7c565f82ff5a378e0d02271bf3fe]]
Former-commit-id: b1cca50984
Former-commit-id: 1798838e3e
2013-06-12 13:25:15 -05:00
Brian Clements
8e2dcd6da5 Issue #2092 added purge results to plugin dao
Alternative purge methods that return the purge results


Former-commit-id: 41f3b7436e [formerly 41f3b7436e [formerly 9e95df4e45e23d3283c5804eb71bff97e6e406ea]]
Former-commit-id: 4fcaedce46
Former-commit-id: 4112a4d969
2013-06-12 12:21:08 -05:00
Nate Jensen
e1d3720fad Issue #2001 fix message priorities
Change-Id: I63b404133f081f7a373ca557adb25827033b1c6b

Former-commit-id: 4184cd436a [formerly 4184cd436a [formerly 10ec050edeea997c50d132dce12d2a78e723ea15]]
Former-commit-id: a31dd6af4c
Former-commit-id: e91f05b0d3
2013-06-12 12:07:34 -05:00
Mike Duff
0912f5e85e Issue #2064 - Corrected Time object storage on subscriptions
Change-Id: I7cb4f53fd8dcdb2fc93ffd15c3a0c72e7eeb57d0

Former-commit-id: a7f277c67b [formerly a7f277c67b [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]
Former-commit-id: 0846f7c79a
Former-commit-id: ec08442f5d
2013-06-12 11:12:05 -05:00
Roger Ferrel
17d5e0f572 Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg.
Change-Id: I5f11ffd383622c49dcfbeb91e08904bad3a508b3

Former-commit-id: 0c3841b243 [formerly 0c3841b243 [formerly 769bc48479c0f5d69c54bf1d541ff1f9c89b0330]]
Former-commit-id: b87c394598
Former-commit-id: 24094e19bc
2013-06-12 08:26:14 -05:00
Brian Clements
65bfc20f72 Issue #2093 updated visisbility for airep and pirep
Former-commit-id: 4118558c4c [formerly 4118558c4c [formerly 4ecaf99a5ac3a4b99c8da1de5afcb6e89040b433]]
Former-commit-id: 460cb6256f
Former-commit-id: 14e22c70a7
2013-06-12 08:20:15 -05:00
Dustin Johnson
6dd87d04a8 Issue #2038 Split db/localization files delta scripts
Former-commit-id: e66eb003e1 [formerly e66eb003e1 [formerly a5b82d84390e71ce8f84652a8417535aed8ed8c6]]
Former-commit-id: 6298c93f7c
Former-commit-id: a6ef6af87b
2013-06-11 17:48:18 -05:00
Nate Jensen
693350efaf Merge "Issue #2089 updated CXF version to 2.5.10" into development
Former-commit-id: 38bb15f137 [formerly 38bb15f137 [formerly 56132cbbb4a673a2f09920fdf764b9067bb8bb80]]
Former-commit-id: afb4ee3356
Former-commit-id: 9fba9a5c78
2013-06-11 17:18:22 -05:00
Dustin Johnson
8fcb0357f9 Merge "Issue #2091 added getFields method to ConvertUtil" into development
Former-commit-id: 2383ccc3e0 [formerly 2383ccc3e0 [formerly 8600b56f3a83eda25c004262a98999d84ab01b89]]
Former-commit-id: 182ae795fc
Former-commit-id: 2f3eeaef80
2013-06-11 17:16:32 -05:00
Brian Clements
680df5d5d9 Issue #2089 updated CXF version to 2.5.10
Former-commit-id: 1ef688109f [formerly 1ef688109f [formerly 3b690f8ba7f3dcb8cc15052b1cadc076fa6b13b2]]
Former-commit-id: 2c6a0a6954
Former-commit-id: 16a2959b09
2013-06-11 16:40:27 -05:00
Brian Clements
9c16059410 Issue #2091 added getFields method to ConvertUtil
Utility method to get an array of Field objects for nested path


Former-commit-id: d679203ef6 [formerly d679203ef6 [formerly c847661ad81d172942e6d0177acb003446f451fd]]
Former-commit-id: aebbc47c73
Former-commit-id: 493d03aac1
2013-06-11 16:34:41 -05:00
Dustin Johnson
28fb05fcae Issue #2090 Improve the performance of Madis purging
Amend: Add note to madisPurgeRules.xml about purge keys

Change-Id: I5c0d86d63e7b725cf2b1e6419c8dfcf6ed8396ef

Former-commit-id: 2aa51f1e5f [formerly 2aa51f1e5f [formerly 3261439e5230bf9d2f2d7e5e81547ae00d924d1e]]
Former-commit-id: 6b228eca86
Former-commit-id: c3c89ca163
2013-06-11 15:44:53 -05:00