Commit graph

1320 commits

Author SHA1 Message Date
Dave Hladky
a6a2bd029f Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: 22c8646d12 [formerly b4e41b137d] [formerly 5aee30a473] [formerly 22c8646d12 [formerly b4e41b137d] [formerly 5aee30a473] [formerly fe5cde7afd [formerly 5aee30a473 [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]]]
Former-commit-id: fe5cde7afd
Former-commit-id: 1c84be15f0 [formerly 34400e34c7] [formerly 7c233606d6e544311ac333659bb714ce5abd5e6b [formerly 671b6ee566]]
Former-commit-id: f434b8d0be63cd3c9508e045f400856715ba657c [formerly c038109d5d]
Former-commit-id: 7dda985dd1
2013-06-25 13:31:37 -05:00
Dustin Johnson
c9b74d06a1 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 fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]]
Former-commit-id: 69c09e530f
Former-commit-id: 84ecc6dec4 [formerly da1ad3c8a0] [formerly 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]]
Former-commit-id: 99261465c72149de5291722572317482216a9d86 [formerly c2ed1495ad]
Former-commit-id: 9b42432838
2013-06-25 08:33:55 -05:00
Richard Peter
f6e6c3c531 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 cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71 [formerly e03283ad4a] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f]
Former-commit-id: ed15c2edcc
2013-06-24 18:51:56 -05:00
Richard Peter
7ef16a186e 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 f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7 [formerly be094a1745] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Richard Peter
a39da3996e 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 8aee8dc9b3 [formerly a67d190612] [formerly 5f85aefff6] [formerly a19a946a24 [formerly 5f85aefff6 [formerly ed31841e537d54ead391013919a94c879afd6f77]]]]
Former-commit-id: a19a946a24
Former-commit-id: 331f7d8c7d [formerly fdad3e08b7] [formerly ee8cacd99e8607bef0978c83c423e6fe4d72f038 [formerly 8481dd6bce]]
Former-commit-id: 0d6a1a2cb8cff64ea7d4e440395cade67cf5d718 [formerly f55e67c3ad]
Former-commit-id: 65d1bed2a8
2013-06-24 17:20:10 -05:00
Max Schenkelberg
815ab796b9 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 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly 47b55981c8 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: 6b4982e8a3 [formerly c912e8e6c5] [formerly 81f10786b9755a530e3615de10b091e1f0022d78 [formerly bc4ebb4f08]]
Former-commit-id: d7196e32710e3cc8969f238de14a54ee542ee1fa [formerly 20caab72f9]
Former-commit-id: 539bbe2cb5
2013-06-24 15:48:37 -05:00
Bryan Kowal
bf4e603d16 Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
Former-commit-id: 03366c8be3 [formerly 2b8984c445] [formerly 5b85217ca2] [formerly 03366c8be3 [formerly 2b8984c445] [formerly 5b85217ca2] [formerly cd2af684ca [formerly 5b85217ca2 [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]]]
Former-commit-id: cd2af684ca
Former-commit-id: e74d5231f4 [formerly a56679fa2a] [formerly 3739eeb144367fe4496f4f3576c97a105d3ba985 [formerly 7ebee00dc9]]
Former-commit-id: f0b6c706cc90420935e5eb81e46db07dd4bd4b84 [formerly 6cff1f63bb]
Former-commit-id: c525056059
2013-06-24 14:08:47 -05:00
Nate Jensen
fd6ecf1273 Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly 6541a89bf5 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]]]
Former-commit-id: 0479cea2e6
Former-commit-id: b1f538f69a [formerly 1408ed3e1e] [formerly 3e82d8ce1477d01da11ffd5777d74864cdbaed97 [formerly a2c5c2a1a3]]
Former-commit-id: 8b3404e8eac76fc9d9c024676d5bff3f54562907 [formerly 3b22e752aa]
Former-commit-id: 25f4b15072
2013-06-24 09:12:12 -05:00
Nate Jensen
fa9ed152ea 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 c144eb1e15 [formerly 8a76694b9f] [formerly b1bd29e784] [formerly 69eec45f13 [formerly b1bd29e784 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]]]
Former-commit-id: 69eec45f13
Former-commit-id: 0740757d72 [formerly f4a6354929] [formerly f61565e208a6a4f9b5ba66da9365773b2a0eaa1e [formerly a44073cce6]]
Former-commit-id: 65599c55a63f72dbd999d4c3c4f89eea0ba5bbf3 [formerly 1c9458d595]
Former-commit-id: a103586ecd
2013-06-24 09:10:01 -05:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Mike Duff
d1d92c033a Issue #2132 - Fix drawing lat/long box for madis point data
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

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

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

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

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

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

Former-commit-id: 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly c57439e5ef [formerly 262d72b786 [formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]]]
Former-commit-id: c57439e5ef
Former-commit-id: 257ea381f2 [formerly 992df9495e] [formerly 45b429a7354ee0273e55beb9753b9356b139eb33 [formerly 959639d118]]
Former-commit-id: 4094ad6aa4322ecabe3e22b888f7911b693dfb22 [formerly 11f0bc708f]
Former-commit-id: ab0a7c9040
2013-06-19 17:24:30 -05:00
Richard Peter
a585c03e23 Merge "Issue #2125 clean up AnnotationBinder warning" into development
Former-commit-id: 81fa365675 [formerly 3a939f5898] [formerly 479ae9bf21] [formerly 81fa365675 [formerly 3a939f5898] [formerly 479ae9bf21] [formerly 7eb4d39903 [formerly 479ae9bf21 [formerly bb65ab2f617ce671bfdc7231956956e881fc6deb]]]]
Former-commit-id: 7eb4d39903
Former-commit-id: 2ea342f97c [formerly af45d2db86] [formerly 2e45e70114526564e06e0c4494d9741161174267 [formerly 8c26fe8be2]]
Former-commit-id: 4c72982b1e471ee7c6991e08a7802ab1e8946c43 [formerly 1a6d67bd16]
Former-commit-id: 7bba9c5a01
2013-06-19 16:41:39 -05:00
Nate Jensen
b1f8dce8d9 Issue #2125 clean up AnnotationBinder warning
Change-Id: I5cd92a9d82527c0b2f3dd68e0f79c10c2db98b0f

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

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

Former-commit-id: 89a179ab97 [formerly 1e7c85a592] [formerly 6f8246262b] [formerly 89a179ab97 [formerly 1e7c85a592] [formerly 6f8246262b] [formerly 314331c9a4 [formerly 6f8246262b [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]]]
Former-commit-id: 314331c9a4
Former-commit-id: 27a2717d88 [formerly a0d8e1dc0c] [formerly cb5dabe6a8d083d3beec439c06b863290f719aae [formerly dab308afc8]]
Former-commit-id: 75782b08f3a19e106f39a37de8b9fcb471f64c5c [formerly aa2c2516ee]
Former-commit-id: 89d5b4327d
2013-06-19 08:56:43 -05:00
Dave Hladky
60d2a941b1 Issue #2120 Updates to retrieval to fix time processing
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b

Former-commit-id: 529c49572e [formerly 01ef1cc0e8] [formerly f2177d48f6] [formerly 529c49572e [formerly 01ef1cc0e8] [formerly f2177d48f6] [formerly 6110467a30 [formerly f2177d48f6 [formerly 5686d945729c28407e16625548050937158f9c65]]]]
Former-commit-id: 6110467a30
Former-commit-id: 3805dfe3d5 [formerly 552e2d0af3] [formerly 72460a6b51da2344082ad18aec8ed9c13cc07b80 [formerly e466f536d0]]
Former-commit-id: 5e3df0d64ec9181139aa9fde7a93e5058070a519 [formerly 039c7f6dec]
Former-commit-id: 9d0458c098
2013-06-19 08:35:50 -05:00
Bryan Kowal
872bbbf16f Issue #1956 - spring changes for minimal EDEX DPA install.
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904

Former-commit-id: c03824479f [formerly 7d2304f4c2] [formerly 2896039f9f] [formerly c03824479f [formerly 7d2304f4c2] [formerly 2896039f9f] [formerly a3736d3b87 [formerly 2896039f9f [formerly 66cfe69bb6653dd43a0740a87a55ad19fe74a362]]]]
Former-commit-id: a3736d3b87
Former-commit-id: 8f502c1941 [formerly 227ee2c54b] [formerly 55da62edd352d9769ad21e328b54db8ac3666ecb [formerly 5495e6e77f]]
Former-commit-id: ac04705f7a89eec34005e7121a2f160754a87474 [formerly 224944e8bb]
Former-commit-id: 6f9757379f
2013-06-18 17:21:21 -05:00
Dustin Johnson
f81cec9d77 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 aea6f77189 [formerly d6bedc07ce] [formerly 8d139f3325] [formerly 2e1d54e686 [formerly 8d139f3325 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]]]
Former-commit-id: 2e1d54e686
Former-commit-id: 4c23003a5d [formerly b2cb6803fd] [formerly 7f1baebdce79cdc1ab1c8680e9b864edf47193f9 [formerly 728f54c6ea]]
Former-commit-id: df0e580dfa4d71a4bfef65db368748b44dc5a766 [formerly 1e95673d90]
Former-commit-id: 8a608c1ef6
2013-06-18 13:55:51 -05:00
Dave Hladky
53239e89d7 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 797ce4201e [formerly da1ea1f213] [formerly 235484e91d] [formerly 6ea9d25f9f [formerly 235484e91d [formerly 75a57b55a997db3edbf9829146b424b8da90cc77]]]]
Former-commit-id: 6ea9d25f9f
Former-commit-id: 77f69d29f4 [formerly d35f214dd0] [formerly c43bf19a9e62e8fe88cb33cf171175c5f4550e28 [formerly 7df10e06ae]]
Former-commit-id: 691332a9eca8a5bb74734fd4f295d45e93817d46 [formerly cc7beb263d]
Former-commit-id: 29310513db
2013-06-18 13:40:02 -05:00
Dustin Johnson
eb194fb644 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 e8511a53ad [formerly b9d8e444b3] [formerly 9bc7c854ab] [formerly 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]]
Former-commit-id: 7ee918a548
Former-commit-id: 73e70fe69a [formerly e7a679ebc7] [formerly 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2]]
Former-commit-id: 3a585d939f08c5550919df20ddfa5031fa2b67c5 [formerly cd12316060]
Former-commit-id: b0c2c25598
2013-06-18 12:34:25 -05:00
Roger Ferrel
46dbde3b3d 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 9fd68957ab [formerly e16bfeee80] [formerly f175b19a93] [formerly c7c27c4cbb [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: 5153afecf9 [formerly 28342fdfed] [formerly d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044]]
Former-commit-id: 712d918bdb6f38e7adc7a9acffe6b62216ccd456 [formerly 2b36404b6c]
Former-commit-id: 0899652c38
2013-06-18 08:56:54 -05:00
Bryan Kowal
824668574a Issue #2100 - export EDEX_BITS earlier
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: 2651970e62 [formerly da49d311e9] [formerly 0e01520e11] [formerly 2651970e62 [formerly da49d311e9] [formerly 0e01520e11] [formerly 9b1596dc0c [formerly 0e01520e11 [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]]]
Former-commit-id: 9b1596dc0c
Former-commit-id: d9ff78a1e2 [formerly f5af2ea95e] [formerly b72275bbcb2a5822e5cb67fccf4f28d45460d357 [formerly abd96b92b7]]
Former-commit-id: 595bd9e93469fd0411003ece6b5b06fa9858241d [formerly 5345a0ae10]
Former-commit-id: b4f4d64b1e
2013-06-17 15:57:18 -05:00
Steve Harris
740f6fb8e0 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 ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]]
Former-commit-id: 532d41787b
Former-commit-id: 324532d6ac [formerly 251b3c1a9e] [formerly 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]]
Former-commit-id: 67413e3c272a714fa394b7a22d2e55375f160635 [formerly 316d2ec667]
Former-commit-id: 01dee712d5
2013-06-17 15:29:01 -05:00
Steve Harris
173bcd08e1 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 97631f9c62] [formerly dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d [formerly 0e4504c0fa] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493]
Former-commit-id: c27136275f
2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Nate Jensen
ff164f9469 Merge "Issue #1924 - standardize build.properties files" into development
Former-commit-id: b86b7f0896 [formerly 146d8d957a] [formerly 41cb1a6552] [formerly b86b7f0896 [formerly 146d8d957a] [formerly 41cb1a6552] [formerly 3a18f54f1c [formerly 41cb1a6552 [formerly 2f6157b0bfca10462e5df7a29205d571a1112b0b]]]]
Former-commit-id: 3a18f54f1c
Former-commit-id: 9ca837c34b [formerly cdc086d4d0] [formerly d3590928d246a71a3a80e2aabd6b045530d82696 [formerly 0241ff964d]]
Former-commit-id: 97d98055e004706059b626ca666b892c400fd34b [formerly ef37f7c6ec]
Former-commit-id: 63f1d82363
2013-06-17 12:31:19 -05:00
Dustin Johnson
61ab58f6a3 Issue #2106 Correct connection password logic, fix test code
Change-Id: I6f7f91542c324ac63214da5e231ab3f267b90f25

Former-commit-id: bfcacf3e0f [formerly 509418e05c] [formerly e1fb1488c9] [formerly bfcacf3e0f [formerly 509418e05c] [formerly e1fb1488c9] [formerly 6cb4800e24 [formerly e1fb1488c9 [formerly e1098a65c04a230590b8460b3da1d12b1046b9b5]]]]
Former-commit-id: 6cb4800e24
Former-commit-id: f55242150b [formerly d364dc9554] [formerly 591a7d57b684a31700084b7efd491511edd37302 [formerly 57be281cb4]]
Former-commit-id: 10ead8dbc085ffb8f8f685fe2c30ee83bf4dd9be [formerly ae0ad86a89]
Former-commit-id: 86d55a558e
2013-06-17 09:24:07 -05:00
Dustin Johnson
b8b6433790 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 67ac09915b [formerly e760d50b7a] [formerly eb03d30375] [formerly 867a55b56a [formerly eb03d30375 [formerly 467d0aa52534f3c34cdcafc0fed7c08f414a4081]]]]
Former-commit-id: 867a55b56a
Former-commit-id: 80fd7d0016 [formerly da003d81f8] [formerly 1ff33a20e9b79c6ab105d46ee0d0ffbca6ebc452 [formerly fa7ab9b2d7]]
Former-commit-id: 3f862121460b5ab47d27d0d00383cd58d4cab6e9 [formerly 87f733edc6]
Former-commit-id: 0df3686a47
2013-06-14 13:24:11 -05:00
Mike Duff
ec8343f132 Issue #2108 - Refactor DataSizeUtils
Change-Id: I0e633fcd69edbbb25b930ac4797ae0934655bd0f

Former-commit-id: a90c9e25b0 [formerly 0411daa2b5] [formerly 532af54aae] [formerly a90c9e25b0 [formerly 0411daa2b5] [formerly 532af54aae] [formerly 9d66579fb9 [formerly 532af54aae [formerly b6fffb21340d210a5a63d5f060f1dfe97b4868fb]]]]
Former-commit-id: 9d66579fb9
Former-commit-id: d4dfd34da0 [formerly b790996fec] [formerly 6e58c059f2d008cb387068a9b1efd3ce8f57906e [formerly ed2ef22679]]
Former-commit-id: 167b66212b70b269c0d11e2c74a5e11a727a99e1 [formerly 4205a90084]
Former-commit-id: 6a36caa011
2013-06-14 12:30:11 -05:00
Dave Hladky
cca8a29e2d 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 a4bf580fef [formerly d1cd0938a6] [formerly e48e4eeb69] [formerly 752f7106bc [formerly e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]]]]
Former-commit-id: 752f7106bc
Former-commit-id: 2aa7d84313 [formerly 456db39e63] [formerly 79c6ea13ea470ea7f499f58fd8dcfb39b4c0650f [formerly 608c43b64a]]
Former-commit-id: 95b15dab75d50950a9a2ef87f7655ab066dfcc2d [formerly 62a1b06b68]
Former-commit-id: 8babe7152c
2013-06-14 12:29:08 -05:00
Dustin Johnson
0cfc77b577 Merge "Issue #2106 Speed up Bandwidth Manager subscription scheduling" into development
Former-commit-id: 7afb994dc7 [formerly 6844e02b73] [formerly f6d907556b] [formerly 7afb994dc7 [formerly 6844e02b73] [formerly f6d907556b] [formerly 4f655f8690 [formerly f6d907556b [formerly 14156b01cb7e4e4250c9e74f4e21116ab9c706b0]]]]
Former-commit-id: 4f655f8690
Former-commit-id: 01d3babc4a [formerly cacb6d1f5a] [formerly a0a3dccdf2ce574e23ef2ef234362006502be99f [formerly 8d7a800600]]
Former-commit-id: 391642f8d04365e01dbc0bd08cc9f3e91a15b6da [formerly 52b0821df6]
Former-commit-id: 97ccd84b66
2013-06-14 10:33:48 -05:00
Richard Peter
b0eb3b7d5d 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 bee6ba6698] [formerly a8998ba493 [formerly 16201b8155] [formerly bee6ba6698] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: dff4f07024 [formerly 7d773e02ca] [formerly 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6]]
Former-commit-id: 639ca2c4c504591489deb97309e220c1d260993a [formerly 6851718b7e]
Former-commit-id: b6dc024e78
2013-06-14 10:06:34 -05:00
Dustin Johnson
b1daddb796 Issue #2106 Speed up Bandwidth Manager subscription scheduling
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba

Former-commit-id: 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 8500856bc1 [formerly 2574f5a25d [formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]]]
Former-commit-id: 8500856bc1
Former-commit-id: 89ba054c7e [formerly 21df56fe4b] [formerly ebd97bec349f489f74ceb16d73ccf3407095667a [formerly b3cad4e40b]]
Former-commit-id: fdb09375286a4151c31608fbe7ad71eeb0ed15ec [formerly 4735212532]
Former-commit-id: e6dd41f2be
2013-06-14 09:25:48 -05:00
Dave Hladky
a794258e6d 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 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 5512104d86 [formerly 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]]]
Former-commit-id: 5512104d86
Former-commit-id: baa2c23f7c [formerly 8d0d10a4f1] [formerly ca6f59dfbdf94182cc17eec76951e9fefb7a9546 [formerly b401764a23]]
Former-commit-id: ef1fc366f8a78f8f78e1e0b1441ba64e94ba3f65 [formerly 6f5039cb43]
Former-commit-id: 90897f5ba5
2013-06-13 22:13:49 -05:00
Bryan Kowal
d73d4d9216 Issue #1924 - standardize build.properties files
Former-commit-id: ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ec78ee1838 [formerly cebb5f8d5f [formerly 739e93988616fefbb235ab3e023b7a7e0394b5e9]]]]
Former-commit-id: ec78ee1838
Former-commit-id: f951c5d78a [formerly 78c52ebb5a] [formerly 97bb0430a3e680ec6666816e15471172d37a62ca [formerly c5c6d1d4d4]]
Former-commit-id: 8faa4e0bc6eec75218489a470d33cdc82b4353ce [formerly fb1cbdebfa]
Former-commit-id: ec5cbd0a49
2013-06-13 16:04:18 -05:00
Nate Jensen
d045893591 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

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

Former-commit-id: cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly a405684c7b [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]]
Former-commit-id: a405684c7b
Former-commit-id: 0954bf6d54 [formerly ab93641992] [formerly 62d48cc824e8c115ac1613fb585e1323080737dd [formerly f64db73aef]]
Former-commit-id: 83b62dcf2e0f30e62ea132f1d213596d0ee89274 [formerly 09e36152db]
Former-commit-id: fa9c9258cd
2013-06-13 10:57:19 -05:00
Dustin Johnson
02e1eba14f 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 915278ace0 [formerly fd61a1e056] [formerly e33cd9d00d] [formerly 45600f3d55 [formerly e33cd9d00d [formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]]]
Former-commit-id: 45600f3d55
Former-commit-id: 7dad7f34a3 [formerly e617f569ff] [formerly 700842421dc70a3d47106ec397a39fb8c2b4a20f [formerly dfdfbe642b]]
Former-commit-id: 1e170ecc38c4aa9b88b36e494674c7eb11edd773 [formerly 3a2f752a22]
Former-commit-id: edcf1392be
2013-06-12 15:41:32 -05:00
Dustin Johnson
010458e6d2 Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: 7a196095cb [formerly e383aa83e1] [formerly a02c9d52556a7097e15119b2711569548c47a69b [formerly c227436a3e]]
Former-commit-id: 9a2f0831aef2aea83818d7bca5ee9fc9cc5099df [formerly f6b7d97fd2]
Former-commit-id: 89b926e15e
2013-06-12 14:52:49 -05:00
Nate Jensen
e661155551 Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: bf7b56460b [formerly dae8945d1a] [formerly 30f9bba5c4] [formerly bf7b56460b [formerly dae8945d1a] [formerly 30f9bba5c4] [formerly 08eb034abc [formerly 30f9bba5c4 [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]]]
Former-commit-id: 08eb034abc
Former-commit-id: 196e111978 [formerly 8516c28fdf] [formerly b8cfd5aa892536823fe2becc29ee2fb4824b6c94 [formerly 53784c5a86]]
Former-commit-id: 565e1662a63070e48f481308853740391c91ce31 [formerly 9b42439288]
Former-commit-id: ce7068cbad
2013-06-12 14:05:15 -05:00