Commit graph

880 commits

Author SHA1 Message Date
Steve Harris
f2a81e18e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Richard Peter
6e9eee551c Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
Former-commit-id: 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 2b207fc6ec [formerly 3ba331e9f5 [formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]]]
Former-commit-id: 2b207fc6ec
Former-commit-id: 52459fd3cc [formerly b061ba5595] [formerly 422f89b43e649e651ca02e3a954f92499144263f [formerly d8cbd1ff39]]
Former-commit-id: 7d5128c91b6fd53bd9edd1c800ecb49af4574ae5 [formerly c2896a01d2]
Former-commit-id: 6bca38d68c
2013-03-27 18:32:38 -05:00
Richard Peter
d5aab5c91d Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
Former-commit-id: b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly 6c4f279623 [formerly 7992b43a7a [formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]]]
Former-commit-id: 6c4f279623
Former-commit-id: 28c463775b [formerly ce746d6228] [formerly 55be6e5f32264ac772c6926e10bae527eaa7a2cd [formerly e68173e147]]
Former-commit-id: 4a5aa05d01f86c1540aab9a3efbffb6f5581f05f [formerly 17a9c008d0]
Former-commit-id: 97a4cd9e1a
2013-03-27 18:28:01 -05:00
Steve Harris
cdad316568 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
f24c14372e Issue #1821 Reduce db and pypies requests in grid assembler.
Former-commit-id: 66d3c4c237 [formerly 6171d60f44] [formerly 60d13f2282] [formerly 66d3c4c237 [formerly 6171d60f44] [formerly 60d13f2282] [formerly 5add905ea7 [formerly 60d13f2282 [formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]]]
Former-commit-id: 5add905ea7
Former-commit-id: f3fdbf45bf [formerly 1312e2ba34] [formerly 76ee35fd160c5eff68caa2f459b481b629252e64 [formerly 37fc71a726]]
Former-commit-id: 24d4b9c26d687a0b2ec88ba6fa980f94edb017f2 [formerly 459e00df31]
Former-commit-id: 1f507138d3
2013-03-27 17:59:58 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
046233d3d6 Issue #1821 make GridInfoCache more elaborate.
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9

Former-commit-id: bedc1bce0a [formerly a31dc1874b] [formerly bc8729d631] [formerly bedc1bce0a [formerly a31dc1874b] [formerly bc8729d631] [formerly 4b6d2fd8d1 [formerly bc8729d631 [formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]]]
Former-commit-id: 4b6d2fd8d1
Former-commit-id: c46190259b [formerly 60b2259343] [formerly 685e6735636d4f309a314a4ceda7fb70182b8d08 [formerly e4462ee41a]]
Former-commit-id: bed489685318ce7bd5ace6503ca4ee1681473d91 [formerly 03eade5b98]
Former-commit-id: 07438ab40a
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
977a96e419 Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1

Former-commit-id: 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 2a14245dce [formerly 115dc12790 [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]]]
Former-commit-id: 2a14245dce
Former-commit-id: 0d769d03c0 [formerly 3cc6978718] [formerly 2e9d43de3c79391b705e7ea079b7e2665d9ca96f [formerly b0010de8ff]]
Former-commit-id: 1500101ef9ca19c8fd54bb60fa6990523169ff1b [formerly 5f8b73fadd]
Former-commit-id: 781b70a8cc
2013-03-27 17:12:52 -05:00
Richard Peter
0d9bf66096 Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
Former-commit-id: 5063faa546 [formerly c11b070571] [formerly c8ae09ab1d] [formerly 5063faa546 [formerly c11b070571] [formerly c8ae09ab1d] [formerly 70a7c3c556 [formerly c8ae09ab1d [formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]]]
Former-commit-id: 70a7c3c556
Former-commit-id: 2ae52dbaee [formerly be2a8e1b16] [formerly 393cfacf90d5055883f5b301797a7483965f899b [formerly de88cceb8c]]
Former-commit-id: a3040a69a63554ef36080379b737ffb513f3e5ca [formerly 09801abaf4]
Former-commit-id: 0522d43c7f
2013-03-27 17:08:00 -05:00
Dustin Johnson
e01c368285 Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 1684507bdb [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]]
Former-commit-id: 1684507bdb
Former-commit-id: 49c53e5443 [formerly 2591041c9d] [formerly 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b]]
Former-commit-id: 9f863145bc53a4b320485d6a4c216ac1f5122e9a [formerly c5685dbe9f]
Former-commit-id: 198fb2b6ae
2013-03-27 15:38:36 -05:00
Ben Steffensmeier
52709e081c Issue #1821 Speed up GridInfoCache.
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40

Former-commit-id: a19226c906 [formerly bd35a06d51] [formerly 2a13abd32c] [formerly a19226c906 [formerly bd35a06d51] [formerly 2a13abd32c] [formerly 6f525a81b4 [formerly 2a13abd32c [formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]]]
Former-commit-id: 6f525a81b4
Former-commit-id: 17a32dc6f1 [formerly bc0153dbba] [formerly ee1c17f89fa0985092ccae8f5eba07c346c20a39 [formerly 72724108b7]]
Former-commit-id: 4caaddd0495a788e3d45d3396506e29eff201d04 [formerly b621850bc6]
Former-commit-id: 06030b77b4
2013-03-27 13:21:33 -05:00
Nate Jensen
bdcaff0e24 Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: 2516680caf [formerly 7f5b3d6f84] [formerly faf937d3b0] [formerly 2516680caf [formerly 7f5b3d6f84] [formerly faf937d3b0] [formerly f8e5534417 [formerly faf937d3b0 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]]]
Former-commit-id: f8e5534417
Former-commit-id: 87e6c58ada [formerly ccf6175c43] [formerly 773d09bbcd8e3e369ba739f7482d25dbd1b2f6ce [formerly a7548df695]]
Former-commit-id: 6893a79ceaacaa477399eedba28f677624c07049 [formerly 9c7466b8e9]
Former-commit-id: 614a1f7738
2013-03-27 11:32:19 -05:00
Ron Anderson
b55ddcee24 Merge "Issue #1833: Add performance log file to ingest and ingestGrib" into omaha_13.3.1
Former-commit-id: 7ce946600d [formerly 60735ddd83] [formerly 841a69ed59] [formerly 7ce946600d [formerly 60735ddd83] [formerly 841a69ed59] [formerly 33d78bc7ee [formerly 841a69ed59 [formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]]]
Former-commit-id: 33d78bc7ee
Former-commit-id: 95001bf982 [formerly dc74b366e9] [formerly 1fc510c7e309d9f5688d57b181aa1c1152754c4e [formerly 6a393ee4f9]]
Former-commit-id: a46eda2c78ecb8612e47c3c6c65a765b13663cb6 [formerly 3fbeeadef3]
Former-commit-id: 583d14ad21
2013-03-27 11:22:48 -05:00
Mike Duff
4f6720a362 Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa

Former-commit-id: 0e1b566dd1 [formerly 1beb6e4fa5] [formerly 1958700112] [formerly 0e1b566dd1 [formerly 1beb6e4fa5] [formerly 1958700112] [formerly 302dbf2cfb [formerly 1958700112 [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]]]
Former-commit-id: 302dbf2cfb
Former-commit-id: be438c6fec [formerly c143b356ef] [formerly 44a7dc0c858099a53c302c46a726f699843c6b9e [formerly 3d1c1b146c]]
Former-commit-id: c9a3b5997a4cce3036f764ce1bf73551bf3542bd [formerly 16f03eb52c]
Former-commit-id: e8d921f415
2013-03-27 10:38:59 -05:00
Richard Peter
e962480999 Issue #1833: Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 5287a3296b [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: b2a73c8d44 [formerly 6923e10550] [formerly 4a26b55e8490ddfd0f35dfb9dc124a2fe903a855 [formerly f99242f539]]
Former-commit-id: 1fa4e3bd516a4977c836f977106434dab62287a5 [formerly 33c602b13e]
Former-commit-id: 786b68279d
2013-03-26 20:55:42 -05:00
Lee Venable
6a0520bd0c Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 954db8db28 [formerly 68e767daaa] [formerly c86daf885b] [formerly 954db8db28 [formerly 68e767daaa] [formerly c86daf885b] [formerly c1adce3a11 [formerly c86daf885b [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]]
Former-commit-id: c1adce3a11
Former-commit-id: caf01174bb [formerly 013748405d] [formerly 4d0bced50facefee11d7f7c6479d9607164529af [formerly 393e6d9ca1]]
Former-commit-id: 59de3c16bd5e71c59f11d770c1f23705a7815186 [formerly ea68209a19]
Former-commit-id: 125517e2d2
2013-03-26 14:33:24 -05:00
Richard Peter
110ec4b47a Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
Former-commit-id: 469f7c60fb [formerly ce83569845] [formerly b947a52604] [formerly 469f7c60fb [formerly ce83569845] [formerly b947a52604] [formerly 7ee513dfed [formerly b947a52604 [formerly b1acf59c03ab308b86843a314d4795f6392de844]]]]
Former-commit-id: 7ee513dfed
Former-commit-id: e4656678c9 [formerly 9c5ce8e741] [formerly 6c418300d90241b2b4b90041a1b7a3d4ae13dd41 [formerly 45a2f3f3dd]]
Former-commit-id: be795e15eceab50216c9bc5be3cbe436ab71f5d2 [formerly 109b578382]
Former-commit-id: 2e5fdfc82c
2013-03-26 12:59:47 -05:00
Steve Harris
56522d8cf5 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01 [formerly 5bb29627dc] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c]
Former-commit-id: 0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 072b1bf35e [formerly 02147470db] [formerly 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3]]
Former-commit-id: 75eb70e2f016a2173b886ec488d1cbc6651d6e51 [formerly 779adedea9]
Former-commit-id: 0d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5 13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]]
Former-commit-id: c65f3e68e5
Former-commit-id: b49c1b0fa8 [formerly 4f2e9aec0d] [formerly 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]]
Former-commit-id: 3a3a2fa20a832cb9027d27e82dc69e0c20123169 [formerly 7aa4f7b265]
Former-commit-id: 25a851cccf
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
16ad8874b9 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: 6b85338835 [formerly a0a0199266] [formerly 79d87a96e7] [formerly 6b85338835 [formerly a0a0199266] [formerly 79d87a96e7] [formerly b0f61cf86c [formerly 79d87a96e7 [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]]
Former-commit-id: b0f61cf86c
Former-commit-id: 4236ca46f5 [formerly a579da7646] [formerly 329fc238b833ee77ae27cbf2f25470dc6acf6e48 [formerly eb13af2f50]]
Former-commit-id: 60a6c0f29a551f6234b42cc9f7a195f867e5c912 [formerly cc64195d47]
Former-commit-id: d31efead69
2013-03-26 12:29:18 -05:00
Steve Harris
19fa3b75b1 Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: 6c5444591a [formerly 9ed8f85b79] [formerly 1f28f6b807] [formerly 6c5444591a [formerly 9ed8f85b79] [formerly 1f28f6b807] [formerly 305994e220 [formerly 1f28f6b807 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]]]
Former-commit-id: 305994e220
Former-commit-id: 591179c773 [formerly ee009dc2d8] [formerly afda4521815801a415515d376dd78372355aaa84 [formerly b1071636a7]]
Former-commit-id: 3f845904375f701e8e0969b257913e018a1b6345 [formerly 74c886b604]
Former-commit-id: f2c2f57cdd
2013-03-26 12:27:54 -05:00
David Gillingham
6217915221 Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 4a0d548c20 [formerly 6fe3d5dc28] [formerly c5c7e31983] [formerly 4a0d548c20 [formerly 6fe3d5dc28] [formerly c5c7e31983] [formerly 54511a95db [formerly c5c7e31983 [formerly 497aa460d6119f13bf6870b78454237252b68752]]]]
Former-commit-id: 54511a95db
Former-commit-id: 5a14c2c503 [formerly 040dc9075c] [formerly b6aa9ae88e412bb4092b5bc723955201a2eb5e12 [formerly 6188c8bd40]]
Former-commit-id: 27ea1ac82b9914961dd76c70ee612b121337a3f6 [formerly 9dd92e0fd2]
Former-commit-id: ebfc7f22b2
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
d38d09cdc1 Issue #1782 fix merge problems related to graphics API.
Former-commit-id: b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 2b898e58c7 [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]]
Former-commit-id: 6edee13cdd
Former-commit-id: 786490e228 [formerly f983e5d705] [formerly 12a49ee4a881d261f0a943322274ece3293cc090 [formerly 76a6213807]]
Former-commit-id: 9c70d98314086fd081f33c5ada1b521712fc8879 [formerly 3dbd9580c5]
Former-commit-id: d523d6371e
2013-03-26 12:06:45 -05:00
Richard Peter
5ffcfa9a72 Issue #1783: Update DatabaseArchiver to stream deserialization of previous records
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44

Former-commit-id: 7a971ee165 [formerly 9773208ff5] [formerly f3844dd2fb] [formerly 7a971ee165 [formerly 9773208ff5] [formerly f3844dd2fb] [formerly 69ffe80046 [formerly f3844dd2fb [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]]]
Former-commit-id: 69ffe80046
Former-commit-id: 5ba47f8dbd [formerly b4965ae08d] [formerly d3c52b0df202be6e89bcdc6793f463be02407c61 [formerly 643ac75965]]
Former-commit-id: 1097880c28f90b1be515d43ca65bf09ccba25dbd [formerly 2a10b44398]
Former-commit-id: 99beb92f3e
2013-03-26 11:40:24 -05:00
Ron Anderson
10b762ebc8 Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: 48f4d944dd [formerly f272034fde] [formerly 57c919bc7b] [formerly 48f4d944dd [formerly f272034fde] [formerly 57c919bc7b] [formerly f65989454a [formerly 57c919bc7b [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]]]
Former-commit-id: f65989454a
Former-commit-id: c8a3f9932e [formerly 758b81f9a2] [formerly bd4f4230cd1d4208dd8b92a0f91479ee01037cf6 [formerly 510b090090]]
Former-commit-id: 35ce5b37bc6ebee2994759cd3e072a0604e4dbe6 [formerly 160779e86f]
Former-commit-id: 1c44fa5d4a
2013-03-26 11:33:15 -05:00
Ben Steffensmeier
128f8f4a9f Issue #1821 Optimize FFG version query.
Former-commit-id: 3e9651bab3 [formerly 54b9d0d949] [formerly 3049bc94c9] [formerly 3e9651bab3 [formerly 54b9d0d949] [formerly 3049bc94c9] [formerly 7bde9f6d32 [formerly 3049bc94c9 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]]]
Former-commit-id: 7bde9f6d32
Former-commit-id: 13c24c63d0 [formerly ae27d029a1] [formerly 8f9afd15bfe68ce83ae16aab8d6d25efc8daf0f1 [formerly 39259b1b0b]]
Former-commit-id: d34e467af21911568bd726f7169eaf15ec02e710 [formerly 1ef06166db]
Former-commit-id: 5e582f019c
2013-03-26 10:37:40 -05:00
David Gillingham
c3a87654de Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly bebfc60317 [formerly 1df8d39919 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]]
Former-commit-id: bebfc60317
Former-commit-id: 1c24ec516d [formerly bf196a7782] [formerly a809765d33e0a62afbe50224ec11b4f9d9365c4f [formerly 07487a27dc]]
Former-commit-id: 04ffee131ad16fc238cce01414a4a0035486bafd [formerly 45bf26aa00]
Former-commit-id: 3b29423947
2013-03-26 10:33:42 -05:00
Steve Harris
81a8604bfe Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]]
Former-commit-id: a23cecdb26
Former-commit-id: 5be2208aaf [formerly 02105701a0] [formerly 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]]
Former-commit-id: 1234c0205c914f2be5f36fcfc47900e46f0e87db [formerly e6ab1deba2]
Former-commit-id: feba54ac83
2013-03-26 10:12:34 -05:00
Mike Duff
868a6c3ddf Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 1314976753 [formerly b366778df0] [formerly 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]]
Former-commit-id: 428a7b37d44680f4388cb79776fa256ccd460279 [formerly efec4d0365]
Former-commit-id: 493014d466
2013-03-26 09:19:39 -05:00
Ron Anderson
da92cce2d9 Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 73678261b6 [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]]
Former-commit-id: 73678261b6
Former-commit-id: 8bf2b31f8e [formerly e4c4862938] [formerly 32aeedbcfe97a863092752841be20ed818c5c741 [formerly 7e6b601a09]]
Former-commit-id: 8fd6002117f54d2deed45eecdba91b1e6e8a577e [formerly 60c1c27225]
Former-commit-id: 3750bb7dba
2013-03-25 17:53:46 -05:00
Max Schenkelberg
bba8b44529 Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: 64df5b6e30 [formerly dabffdbf79] [formerly fd375314cd] [formerly 64df5b6e30 [formerly dabffdbf79] [formerly fd375314cd] [formerly e17d691400 [formerly fd375314cd [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]]]
Former-commit-id: e17d691400
Former-commit-id: 713eb3c6b2 [formerly 8d1b555c39] [formerly 528104a5b0354eab9bd2b915e876dcaab9beaf01 [formerly 36e80c267e]]
Former-commit-id: e7a427001d772f2ad9fa8e8138a1e46476665765 [formerly 237c742d44]
Former-commit-id: 7c4be8a559
2013-03-25 15:38:36 -05:00
Richard Peter
228453439d Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 5c92140024 [formerly c3268aa02c [formerly b8516f99386ded052745e766911094edfd57d7ec]]]]
Former-commit-id: 5c92140024
Former-commit-id: d33b9859c2 [formerly 072bc7affc] [formerly 76ef672a3d495ecff9dda9924de866473ac56ce0 [formerly 351f08dba3]]
Former-commit-id: 77d040b2214a8a9c514a25092b9dd5acf0743cce [formerly bcb5b0b73e]
Former-commit-id: af956fe92d
2013-03-25 15:37:18 -05:00
Bryan Kowal
a1de8e0a67 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 6758a9a50d [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]]
Former-commit-id: 6758a9a50d
Former-commit-id: f1b0e60b8e [formerly 1eba8622d4] [formerly b5e09dca5c13d2f76056db298c6ddcd8fba31a7e [formerly 4c02dabb3d]]
Former-commit-id: 0741dba9cedb08ccd4a8faa71fb209bc0dbf6617 [formerly e41f926ac2]
Former-commit-id: d5c958b2f8
2013-03-25 15:23:32 -05:00
Bryan Kowal
7ef1b5e065 Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly a6cd17feeb [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 5012e869e3 [formerly 2093c6a495] [formerly 1710b26cc53566e26fc66c7ee6bcd14b0dbcbc08 [formerly c4cec34e47]]
Former-commit-id: 31db227b7bdc186a52966c1efdd832477bc27159 [formerly 99a3e25b3d]
Former-commit-id: 3728413ecf
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
e7ea63963d Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129 [formerly 541646148b] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b]
Former-commit-id: 5e50d32bdb
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
b83ebf6691 Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 1373ffd0ff [formerly 5d01725fea] [formerly 4621133ff1] [formerly 1373ffd0ff [formerly 5d01725fea] [formerly 4621133ff1] [formerly 75c8d46901 [formerly 4621133ff1 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]]]
Former-commit-id: 75c8d46901
Former-commit-id: e67855df4f [formerly e722fa0723] [formerly a6da43b603f6c650bb2b2ea9df487300a1c5efb7 [formerly 04028b0136]]
Former-commit-id: 01f6e04d980b175810fe8822f4d6f0b3bc3bc97d [formerly c48c98266d]
Former-commit-id: 7a334d3417
2013-03-25 15:09:23 -05:00
Richard Peter
771da3295b Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
Former-commit-id: a43becec4f [formerly c7dd6365d2] [formerly 7b8931ed16] [formerly a43becec4f [formerly c7dd6365d2] [formerly 7b8931ed16] [formerly 3239c176fa [formerly 7b8931ed16 [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]]]
Former-commit-id: 3239c176fa
Former-commit-id: 25263a5042 [formerly 516bb024bb] [formerly 796dc63ca754008f87cdac9906820fb992597f43 [formerly 911a371329]]
Former-commit-id: f9d4a1edf08b99373c2258e36d85b2b9fe8420bd [formerly fecf49708c]
Former-commit-id: 917621b347
2013-03-25 14:45:06 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
5475d95f5f 13.3.1-11 baseline
Former-commit-id: 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 373d13df39 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]]]
Former-commit-id: 373d13df39
Former-commit-id: c37e88ac4a [formerly 11baf4c2f0] [formerly 5e334c606f97e4e1517274a870990e91b9366443 [formerly d868003067]]
Former-commit-id: 08684e579497450790c8171b039c08f89d82117d [formerly b5e3a7dda6]
Former-commit-id: 72151c0e6a
2013-03-25 13:20:03 -05:00
Dave Hladky
30dc356683 Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly f2e13c8078 [formerly a53797bc2f [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]]]
Former-commit-id: f2e13c8078
Former-commit-id: b401967738 [formerly a997706b72] [formerly 7262596460876e4be6f35b9c3b9a662ae067405d [formerly 05ae375e08]]
Former-commit-id: 7067eafc09f5f2a62e39521cd47c896056bc7767 [formerly fc7c4f2d90]
Former-commit-id: 20a24d3e8c
2013-03-22 16:37:20 -05:00
Richard Peter
cbc371109c Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
Former-commit-id: e492d8c351 [formerly bb2be2d6a7] [formerly 1b7e9e41ce] [formerly e492d8c351 [formerly bb2be2d6a7] [formerly 1b7e9e41ce] [formerly 3de0400969 [formerly 1b7e9e41ce [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]]]
Former-commit-id: 3de0400969
Former-commit-id: 5989bc1894 [formerly d1b4d899be] [formerly e50e5d685426dd553ea338be6ee39be5bcda1f72 [formerly 50254dc8d1]]
Former-commit-id: dac4b40d3584b9d3d92e15ab278064d6922885e0 [formerly 66a28e9315]
Former-commit-id: 1084723e4b
2013-03-22 16:26:52 -05:00
Dave Hladky
edde66e8f2 Issue #1817 BOX issue with only having HUC0 in template
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: 611f180e72 [formerly c2b9bd1024] [formerly 58a37d1e44] [formerly 611f180e72 [formerly c2b9bd1024] [formerly 58a37d1e44] [formerly d114302b06 [formerly 58a37d1e44 [formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]]]
Former-commit-id: d114302b06
Former-commit-id: 5f8ac1e458 [formerly 150cd54602] [formerly a6c0cfd63967b9b4f31e6242a2aad2a654b52cbe [formerly 3cdd8f8ed2]]
Former-commit-id: 66bc0011dbc6bee573d6a149bc3641646c869ad2 [formerly bc2a1a20e1]
Former-commit-id: 4eec5881e9
2013-03-22 16:21:45 -05:00
Dustin Johnson
07be638779 Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: b1f365220f [formerly f5cc517f9a] [formerly dcfbb43eb3] [formerly b1f365220f [formerly f5cc517f9a] [formerly dcfbb43eb3] [formerly 8651ca3d76 [formerly dcfbb43eb3 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]]]
Former-commit-id: 8651ca3d76
Former-commit-id: 6adeb41238 [formerly c55f2ce559] [formerly 972f2290f05ee741a20729ef834101416b95b220 [formerly 0596d43d99]]
Former-commit-id: a42de8d20be8a050fdacc4249ee7b490fcd62a7b [formerly dcc7e44250]
Former-commit-id: eb0f12b15f
2013-03-22 15:28:57 -05:00
Dustin Johnson
e2a6167de3 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
Former-commit-id: efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly ed017996a0 [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]]]
Former-commit-id: ed017996a0
Former-commit-id: bd04bd2c8c [formerly f274b8cd5b] [formerly 19450b614092a79e5518ae5c8a927c2aeb594359 [formerly 9e63142576]]
Former-commit-id: 3b9a725cb7e0fe573edc1ee175256ab462601148 [formerly e4c51bad63]
Former-commit-id: 087e01d4e4
2013-03-22 15:28:20 -05:00
Max Schenkelberg
971baf62b1 Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 126be0cfe5 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 44f5bd04b6 [formerly 850c8995cc] [formerly b81da1853ef8773cba40a9f1ed03ab5d498966c2 [formerly d20958ae92]]
Former-commit-id: ae3d695d3cfd46a5aade2f00de5657f386699789 [formerly 34134b3c62]
Former-commit-id: 3ba217badb
2013-03-22 10:54:44 -05:00
David Gillingham
3b8f35d9bf Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: 3fdecaec6e [formerly c8c7fb4129] [formerly 0957f6a5eec508c235f5324a4ce32b5064183a23 [formerly c3ce4058a0]]
Former-commit-id: 2f5d9615c33ca7ab3903f26aee8791ab3f06072b [formerly 7a2c92efc7]
Former-commit-id: 75a6163bf3
2013-03-22 10:39:13 -05:00
Dustin Johnson
c5464667d5 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 0dcc67bc55 [formerly 53291f7130] [formerly 21a7a7505def7dce020a2a08ac7e2a12253adea8 [formerly 1b1bd69b89]]
Former-commit-id: 696e1ca91ff58627044275c70673d28ff343a7af [formerly e39187c0ce]
Former-commit-id: 0c92ddab72
2013-03-22 10:04:21 -05:00
Richard Peter
e62f6880db Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: fced329e1c [formerly 4b386ccd1c] [formerly 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5]]
Former-commit-id: b5d724833aad45d35e88e62204aca2b28b69dbf0 [formerly 1cb743c14a]
Former-commit-id: 3a0627b5d1
2013-03-21 18:21:53 -05:00
Dustin Johnson
3e8624a3e8 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly c4d4e37cad [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]]
Former-commit-id: c4d4e37cad
Former-commit-id: ccb959c686 [formerly 09d1d7b6cf] [formerly e46190078db46b56cb5461797a9ab3f3c3ecb7f5 [formerly d58306a92e]]
Former-commit-id: abf3adf681b6aeddfe60c155ab334a33629028b4 [formerly 0f4ec00790]
Former-commit-id: 4d41fca019
2013-03-21 16:14:49 -05:00