Commit graph

1422 commits

Author SHA1 Message Date
Richard Peter
350804e7f4 Merge "Issue #2144 Switched hibernate to Post GIS config" into development
Former-commit-id: 6bd546714c [formerly b616339f1d] [formerly 8a9feffa82] [formerly ad91edf3de [formerly 8a9feffa82 [formerly d59f39da96caaf163ceb5bc7055b0412e118875b]]]
Former-commit-id: ad91edf3de
Former-commit-id: 16947784ce2c607d53a7a1ee83a309f7883b0bcd [formerly dedc9ecda0]
Former-commit-id: 8c968f2120
2013-06-25 18:22:09 -05:00
Roger Ferrel
4b10182a2e Issue #1966 Initial Base configuration files for Dale Morris to test.
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c]
Former-commit-id: 318de198e5
2013-06-25 13:44:30 -05:00
Dave Hladky
1c84be15f0 Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: 22c8646d12 [formerly b4e41b137d] [formerly 5aee30a473] [formerly fe5cde7afd [formerly 5aee30a473 [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]]
Former-commit-id: fe5cde7afd
Former-commit-id: 7c233606d6e544311ac333659bb714ce5abd5e6b [formerly 671b6ee566]
Former-commit-id: 34400e34c7
2013-06-25 13:31:37 -05:00
Dustin Johnson
84ecc6dec4 Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]
Former-commit-id: 69c09e530f
Former-commit-id: 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]
Former-commit-id: da1ad3c8a0
2013-06-25 08:33:55 -05:00
Richard Peter
bf6e4c1f71 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: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]
Former-commit-id: e03283ad4a
2013-06-24 18:51:56 -05:00
Richard Peter
46ee2f5dd7 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: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]
Former-commit-id: be094a1745
2013-06-24 18:36:15 -05:00
Richard Peter
331f7d8c7d Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
Former-commit-id: 8aee8dc9b3 [formerly a67d190612] [formerly 5f85aefff6] [formerly a19a946a24 [formerly 5f85aefff6 [formerly ed31841e537d54ead391013919a94c879afd6f77]]]
Former-commit-id: a19a946a24
Former-commit-id: ee8cacd99e8607bef0978c83c423e6fe4d72f038 [formerly 8481dd6bce]
Former-commit-id: fdad3e08b7
2013-06-24 17:20:10 -05:00
Max Schenkelberg
6b4982e8a3 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: 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly 47b55981c8 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: 81f10786b9755a530e3615de10b091e1f0022d78 [formerly bc4ebb4f08]
Former-commit-id: c912e8e6c5
2013-06-24 15:48:37 -05:00
Bryan Kowal
e74d5231f4 Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
Former-commit-id: 03366c8be3 [formerly 2b8984c445] [formerly 5b85217ca2] [formerly cd2af684ca [formerly 5b85217ca2 [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]]
Former-commit-id: cd2af684ca
Former-commit-id: 3739eeb144367fe4496f4f3576c97a105d3ba985 [formerly 7ebee00dc9]
Former-commit-id: a56679fa2a
2013-06-24 14:08:47 -05:00
Nate Jensen
b1f538f69a Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly 6541a89bf5 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]]
Former-commit-id: 0479cea2e6
Former-commit-id: 3e82d8ce1477d01da11ffd5777d74864cdbaed97 [formerly a2c5c2a1a3]
Former-commit-id: 1408ed3e1e
2013-06-24 09:12:12 -05:00
Nate Jensen
0740757d72 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: c144eb1e15 [formerly 8a76694b9f] [formerly b1bd29e784] [formerly 69eec45f13 [formerly b1bd29e784 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]]
Former-commit-id: 69eec45f13
Former-commit-id: f61565e208a6a4f9b5ba66da9365773b2a0eaa1e [formerly a44073cce6]
Former-commit-id: f4a6354929
2013-06-24 09:10:01 -05:00
Steve Harris
e1a5587dd0 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]
Former-commit-id: deebdb874a
2013-06-24 09:29:43 -04:00
Mike Duff
c180323417 Issue #2132 - Fix drawing lat/long box for madis point data
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

Former-commit-id: 9d3c4ce704 [formerly 7b3d79edc9] [formerly f685e73bd2] [formerly 14bd577f6c [formerly f685e73bd2 [formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]]
Former-commit-id: 14bd577f6c
Former-commit-id: f7a3f48b1fa32bf56ed18d0e266ac2ee25be2f81 [formerly 65faaadc7c]
Former-commit-id: defc6a3080
2013-06-21 14:59:03 -05:00
Dave Hladky
c31c51deee Issue #2129 mkdirs call added to create directories at instantiation.
Change-Id: I163e3f832e04af17da8a18196a10b50d30b8c83d

Former-commit-id: 2ad3456324 [formerly b781e784f9] [formerly 26398f6fb7] [formerly 0544a0cf88 [formerly 26398f6fb7 [formerly b8ae6705e92e8816385cb2fce87175bbb4687d6d]]]
Former-commit-id: 0544a0cf88
Former-commit-id: e4b8756f8f25109e757f64231aff3bde10c6fa5e [formerly 57caa68867]
Former-commit-id: 1f640b3173
2013-06-21 11:13:04 -05:00
Dustin Johnson
288442cc56 Issue #2106 Fix setting of data size on gridded subscriptions
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925

Former-commit-id: 2184e50ce1 [formerly 71da2985f7] [formerly b486e5f2fe] [formerly 554b43807e [formerly b486e5f2fe [formerly c9138bb9d844ed7c38df420734c2723321ad450b]]]
Former-commit-id: 554b43807e
Former-commit-id: f2fb463c4b87ba9647cb7461559ab4814fb6d249 [formerly eaa3e47877]
Former-commit-id: 7887201ebf
2013-06-20 16:00:08 -05:00
Dustin Johnson
bf2f6eebd8 Issue #1802 Fix event processing in regards to transaction commits/rollbacks
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22

Former-commit-id: de8c9a4915 [formerly a606508cd4] [formerly ecae75ecd8] [formerly a331cd2958 [formerly ecae75ecd8 [formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]
Former-commit-id: a331cd2958
Former-commit-id: b97c78d83811f1218347ce87ea5843be3bb4e72f [formerly d2faa3b600]
Former-commit-id: cf36003f12
2013-06-20 13:53:04 -05:00
Dave Hladky
7d0a29e45e Issue #2120 Fixed SSL connection problem
Change-Id: I4a4e277ac75420bbaa621dcddb562e654211436c

Former-commit-id: 76ffd26a2a [formerly 4a6248547a] [formerly ffc9dc1ac9] [formerly 47d18e42ab [formerly ffc9dc1ac9 [formerly 85d7c148e78a61025fa52f8c0996f99ab6075392]]]
Former-commit-id: 47d18e42ab
Former-commit-id: a15be669f33bfbbd824bd50023487023cff935d3 [formerly 5d37e710d7]
Former-commit-id: b2545d7408
2013-06-20 12:51:30 -05:00
Ben Steffensmeier
f318fef863 Issue #2128 ensure setDataURI sets the dataURI.
Former-commit-id: 2598b08d69 [formerly b507b6b1fd] [formerly f02b073cc8] [formerly 68bb07f5fa [formerly f02b073cc8 [formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]]
Former-commit-id: 68bb07f5fa
Former-commit-id: 8ff11c8549d6d75928d3a0627db7abad67a6caeb [formerly 69f1d9d812]
Former-commit-id: 38f7211e99
2013-06-20 11:11:37 -05:00
Matt Nash
389c518d07 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: 22a6ac6460 [formerly 0fe30ac2fb] [formerly 54a114d789] [formerly 99e9194921 [formerly 54a114d789 [formerly 95ec6db9b349890a29bd13860193ada39b43c294]]]
Former-commit-id: 99e9194921
Former-commit-id: 3285d64a25c4b063cb7870f164e60f088e108622 [formerly 4fa399c710]
Former-commit-id: 6486801d2c
2013-06-20 06:59:05 -05:00
Max Schenkelberg
257ea381f2 Issue #2122 Cleaned up dependencies for satellite
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e

Former-commit-id: 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly c57439e5ef [formerly 262d72b786 [formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]]
Former-commit-id: c57439e5ef
Former-commit-id: 45b429a7354ee0273e55beb9753b9356b139eb33 [formerly 959639d118]
Former-commit-id: 992df9495e
2013-06-19 17:24:30 -05:00
Richard Peter
2ea342f97c Merge "Issue #2125 clean up AnnotationBinder warning" into development
Former-commit-id: 81fa365675 [formerly 3a939f5898] [formerly 2f4c55008cd996d5a8846a9cf5ca6fa2ffdd8e43 [formerly 479ae9bf21]] [formerly 7eb4d39903 [formerly 479ae9bf21 [formerly bb65ab2f617ce671bfdc7231956956e881fc6deb]]]
Former-commit-id: 7eb4d39903
Former-commit-id: 2e45e70114526564e06e0c4494d9741161174267 [formerly 8c26fe8be2]
Former-commit-id: af45d2db86
2013-06-19 16:41:39 -05:00
Nate Jensen
9dc4d71d70 Issue #2125 clean up AnnotationBinder warning
Change-Id: I5cd92a9d82527c0b2f3dd68e0f79c10c2db98b0f

Former-commit-id: d8941df98f [formerly dfa3d15cab] [formerly 3f1fc8b367] [formerly 2bcaafac83 [formerly 3f1fc8b367 [formerly 8c1e060a42576ce0b5d9048f8e93ae07ef03e73b]]]
Former-commit-id: 2bcaafac83
Former-commit-id: d687f5d404035699eed607a2d3451caa2b039eb2 [formerly bdda4a11d5]
Former-commit-id: a71d567d77
2013-06-19 15:56:32 -05:00
Bryan Kowal
a5726ffecd 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: 71ea599f74 [formerly cb8cb03d7d] [formerly 8f479a2536] [formerly a877e9589c [formerly 8f479a2536 [formerly 914587220cb65cb22b788a5bf1e867cdf53cf5bf]]]
Former-commit-id: a877e9589c
Former-commit-id: 660d84775468edb75cec6afdf965bd703d25ff7b [formerly 09c48506e7]
Former-commit-id: 624d423b10
2013-06-19 13:43:16 -05:00
Roger Ferrel
fef68ac4b6 Issue #2110 RequestRouter.route(req) changed the class returned.
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f

Former-commit-id: 90c20a0418 [formerly c6b4424fb7] [formerly 00b68298e3154c30b9e4b78f8b7fef91df8b2445 [formerly f3a1c68d40]] [formerly 4443dfd11a [formerly f3a1c68d40 [formerly cda40b66492abf6a0064d28484b03e05500f7bed]]]
Former-commit-id: 4443dfd11a
Former-commit-id: 2863f767cd091957133e715c06b8ee4a29858c9f [formerly 7c7b1264d1]
Former-commit-id: a2db3ff22c
2013-06-19 11:25:55 -05:00
Dustin Johnson
185670ff4e Merge "Issue #1956 - spring changes for minimal EDEX DPA install." into development
Former-commit-id: 8f4097459f [formerly 8476a54e1d] [formerly d3ea12c7212bfd552e15c58be2803ee1f953a5ec [formerly de7d8fc970]] [formerly 4993a17306 [formerly de7d8fc970 [formerly 39973de8b36242d0a979e484e77822a68db289ed]]]
Former-commit-id: 4993a17306
Former-commit-id: cfd5c34492b70c4ab0e2c150a325e59380ff1e38 [formerly 235b75021b]
Former-commit-id: 7b272f5c13
2013-06-19 10:37:02 -05:00
Nate Jensen
ff64bf589b 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: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]
Former-commit-id: afae330d8a
2013-06-19 10:16:06 -05:00
Dustin Johnson
27a2717d88 Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

Former-commit-id: 89a179ab97 [formerly 1e7c85a592] [formerly 1494a604ae1cff7c7ecb8ca757c674dc2c661557 [formerly 6f8246262b]] [formerly 314331c9a4 [formerly 6f8246262b [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]]
Former-commit-id: 314331c9a4
Former-commit-id: cb5dabe6a8d083d3beec439c06b863290f719aae [formerly dab308afc8]
Former-commit-id: a0d8e1dc0c
2013-06-19 08:56:43 -05:00
Dave Hladky
3805dfe3d5 Issue #2120 Updates to retrieval to fix time processing
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b

Former-commit-id: 529c49572e [formerly 01ef1cc0e8] [formerly f2177d48f6] [formerly 6110467a30 [formerly f2177d48f6 [formerly 5686d945729c28407e16625548050937158f9c65]]]
Former-commit-id: 6110467a30
Former-commit-id: 72460a6b51da2344082ad18aec8ed9c13cc07b80 [formerly e466f536d0]
Former-commit-id: 552e2d0af3
2013-06-19 08:35:50 -05:00
Bryan Kowal
8f502c1941 Issue #1956 - spring changes for minimal EDEX DPA install.
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904

Former-commit-id: c03824479f [formerly 7d2304f4c2] [formerly 2896039f9f] [formerly a3736d3b87 [formerly 2896039f9f [formerly 66cfe69bb6653dd43a0740a87a55ad19fe74a362]]]
Former-commit-id: a3736d3b87
Former-commit-id: 55da62edd352d9769ad21e328b54db8ac3666ecb [formerly 5495e6e77f]
Former-commit-id: 227ee2c54b
2013-06-18 17:21:21 -05:00
Dustin Johnson
4c23003a5d Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
Former-commit-id: aea6f77189 [formerly d6bedc07ce] [formerly 8d139f3325] [formerly 2e1d54e686 [formerly 8d139f3325 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]]
Former-commit-id: 2e1d54e686
Former-commit-id: 7f1baebdce79cdc1ab1c8680e9b864edf47193f9 [formerly 728f54c6ea]
Former-commit-id: b2cb6803fd
2013-06-18 13:55:51 -05:00
Dave Hladky
77f69d29f4 Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8

Former-commit-id: 797ce4201e [formerly da1ea1f213] [formerly 235484e91d] [formerly 6ea9d25f9f [formerly 235484e91d [formerly 75a57b55a997db3edbf9829146b424b8da90cc77]]]
Former-commit-id: 6ea9d25f9f
Former-commit-id: c43bf19a9e62e8fe88cb33cf171175c5f4550e28 [formerly 7df10e06ae]
Former-commit-id: d35f214dd0
2013-06-18 13:40:02 -05:00
Dustin Johnson
73e70fe69a Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: e8511a53ad [formerly b9d8e444b3] [formerly 9bc7c854ab] [formerly 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]
Former-commit-id: 7ee918a548
Former-commit-id: 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2]
Former-commit-id: e7a679ebc7
2013-06-18 12:34:25 -05:00
Roger Ferrel
5153afecf9 Issue #1966 Column sort added; bug fixes to size estimates and saving files.
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa

Former-commit-id: 9fd68957ab [formerly e16bfeee80] [formerly f175b19a93] [formerly c7c27c4cbb [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044]
Former-commit-id: 28342fdfed
2013-06-18 08:56:54 -05:00
Bryan Kowal
d9ff78a1e2 Issue #2100 - export EDEX_BITS earlier
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: 2651970e62 [formerly da49d311e9] [formerly 0e01520e11] [formerly 9b1596dc0c [formerly 0e01520e11 [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]]
Former-commit-id: 9b1596dc0c
Former-commit-id: b72275bbcb2a5822e5cb67fccf4f28d45460d357 [formerly abd96b92b7]
Former-commit-id: f5af2ea95e
2013-06-17 15:57:18 -05:00
Steve Harris
324532d6ac 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: ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]
Former-commit-id: 251b3c1a9e
2013-06-17 15:29:01 -05:00
Steve Harris
a5fb9b721d 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: dadf03acaf [formerly 41748175b6] [formerly 8a27d96b844873d84abafe2421e8bfc28bd9b9a6 [formerly 97631f9c62]] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]
Former-commit-id: 0e4504c0fa
2013-06-17 15:25:32 -05:00
Steve Harris
0f83e19dab 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]
Former-commit-id: ccd66c0724
2013-06-17 15:01:22 -04:00
Nate Jensen
9ca837c34b Merge "Issue #1924 - standardize build.properties files" into development
Former-commit-id: b86b7f0896 [formerly 146d8d957a] [formerly 41cb1a6552] [formerly 3a18f54f1c [formerly 41cb1a6552 [formerly 2f6157b0bfca10462e5df7a29205d571a1112b0b]]]
Former-commit-id: 3a18f54f1c
Former-commit-id: d3590928d246a71a3a80e2aabd6b045530d82696 [formerly 0241ff964d]
Former-commit-id: cdc086d4d0
2013-06-17 12:31:19 -05:00
Dustin Johnson
f55242150b Issue #2106 Correct connection password logic, fix test code
Change-Id: I6f7f91542c324ac63214da5e231ab3f267b90f25

Former-commit-id: bfcacf3e0f [formerly 509418e05c] [formerly e1fb1488c9] [formerly 6cb4800e24 [formerly e1fb1488c9 [formerly e1098a65c04a230590b8460b3da1d12b1046b9b5]]]
Former-commit-id: 6cb4800e24
Former-commit-id: 591a7d57b684a31700084b7efd491511edd37302 [formerly 57be281cb4]
Former-commit-id: d364dc9554
2013-06-17 09:24:07 -05:00
Dustin Johnson
80fd7d0016 Merge "Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1" into development
Former-commit-id: 67ac09915b [formerly e760d50b7a] [formerly eb03d30375] [formerly 867a55b56a [formerly eb03d30375 [formerly 467d0aa52534f3c34cdcafc0fed7c08f414a4081]]]
Former-commit-id: 867a55b56a
Former-commit-id: 1ff33a20e9b79c6ab105d46ee0d0ffbca6ebc452 [formerly fa7ab9b2d7]
Former-commit-id: da003d81f8
2013-06-14 13:24:11 -05:00
Mike Duff
d4dfd34da0 Issue #2108 - Refactor DataSizeUtils
Change-Id: I0e633fcd69edbbb25b930ac4797ae0934655bd0f

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

Former-commit-id: a4bf580fef [formerly d1cd0938a6] [formerly e48e4eeb69] [formerly 752f7106bc [formerly e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]]]
Former-commit-id: 752f7106bc
Former-commit-id: 79c6ea13ea470ea7f499f58fd8dcfb39b4c0650f [formerly 608c43b64a]
Former-commit-id: 456db39e63
2013-06-14 12:29:08 -05:00
Dustin Johnson
01d3babc4a Merge "Issue #2106 Speed up Bandwidth Manager subscription scheduling" into development
Former-commit-id: 7afb994dc7 [formerly 6844e02b73] [formerly f6d907556b] [formerly 4f655f8690 [formerly f6d907556b [formerly 14156b01cb7e4e4250c9e74f4e21116ab9c706b0]]]
Former-commit-id: 4f655f8690
Former-commit-id: a0a3dccdf2ce574e23ef2ef234362006502be99f [formerly 8d7a800600]
Former-commit-id: cacb6d1f5a
2013-06-14 10:33:48 -05:00
Richard Peter
dff4f07024 Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: a8998ba493 [formerly 16201b8155] [formerly e03c8216ad1b651d464b8d3b42777ad897030bd0 [formerly bee6ba6698]] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6]
Former-commit-id: 7d773e02ca
2013-06-14 10:06:34 -05:00
Dustin Johnson
89ba054c7e Issue #2106 Speed up Bandwidth Manager subscription scheduling
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba

Former-commit-id: 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 8500856bc1 [formerly 2574f5a25d [formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]]
Former-commit-id: 8500856bc1
Former-commit-id: ebd97bec349f489f74ceb16d73ccf3407095667a [formerly b3cad4e40b]
Former-commit-id: 21df56fe4b
2013-06-14 09:25:48 -05:00
Dave Hladky
baa2c23f7c Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 5512104d86 [formerly 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]]
Former-commit-id: 5512104d86
Former-commit-id: ca6f59dfbdf94182cc17eec76951e9fefb7a9546 [formerly b401764a23]
Former-commit-id: 8d0d10a4f1
2013-06-13 22:13:49 -05:00
Bryan Kowal
f951c5d78a Issue #1924 - standardize build.properties files
Former-commit-id: ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ec78ee1838 [formerly cebb5f8d5f [formerly 739e93988616fefbb235ab3e023b7a7e0394b5e9]]]
Former-commit-id: ec78ee1838
Former-commit-id: 97bb0430a3e680ec6666816e15471172d37a62ca [formerly c5c6d1d4d4]
Former-commit-id: 78c52ebb5a
2013-06-13 16:04:18 -05:00
Nate Jensen
f173cc29e1 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]
Former-commit-id: 4a39d586d2
2013-06-13 11:39:30 -05:00
Roger Ferrel
0954bf6d54 Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd

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

Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901

Former-commit-id: 915278ace0 [formerly fd61a1e056] [formerly e33cd9d00d] [formerly 45600f3d55 [formerly e33cd9d00d [formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]]
Former-commit-id: 45600f3d55
Former-commit-id: 700842421dc70a3d47106ec397a39fb8c2b4a20f [formerly dfdfbe642b]
Former-commit-id: e617f569ff
2013-06-12 15:41:32 -05:00