Commit graph

766 commits

Author SHA1 Message Date
Nate Jensen
f981b7b9b1 Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
Former-commit-id: 4db98f508d [formerly d0db96df45] [formerly dbd2729336] [formerly 4db98f508d [formerly d0db96df45] [formerly dbd2729336] [formerly eaef235e8e [formerly dbd2729336 [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]]
Former-commit-id: eaef235e8e
Former-commit-id: d7696aa692 [formerly 15b3d5add6] [formerly 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442]]
Former-commit-id: 5e309f9fa3e25596f11809c78831943947e408ed [formerly 4539ef8b58]
Former-commit-id: 165fbf3646
2013-03-13 16:17:44 -05:00
Dave Hladky
b111edeb8b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
f5d83f4c32 Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 45cf2fd0ff [formerly 51955a719a] [formerly 36b3c16a42] [formerly 45cf2fd0ff [formerly 51955a719a] [formerly 36b3c16a42] [formerly ddf2092bde [formerly 36b3c16a42 [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]]
Former-commit-id: ddf2092bde
Former-commit-id: 6e0c60c210 [formerly a1ca2ae2d7] [formerly 9ff9ba942dcb40894a6b2a25b30b686d76272ff6 [formerly 247c9f6c1f]]
Former-commit-id: a9c09f254baa3c3e3c8f54b1f737da4393b40042 [formerly 04882c798f]
Former-commit-id: 15a16c8d81
2013-03-13 13:21:16 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Roger Ferrel
cef241d8f8 Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4

Former-commit-id: 82b526851a [formerly f912d9ece3] [formerly c5a2786c84] [formerly 82b526851a [formerly f912d9ece3] [formerly c5a2786c84] [formerly b5743e8f9b [formerly c5a2786c84 [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]]
Former-commit-id: b5743e8f9b
Former-commit-id: b2845a11d0 [formerly a9a0a471f9] [formerly b8373ea3e1f95cfdea39442e15da79444813af3c [formerly 8bb9044e3a]]
Former-commit-id: a992232e6a449b734a792e862f3d7cf15e059841 [formerly 5546691fd6]
Former-commit-id: cf7b0e99f7
2013-03-12 16:58:06 -05:00
Dave Hladky
87992329b4 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	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
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Roger Ferrel
590ef32dcb Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]]
Former-commit-id: b421c97d86
Former-commit-id: 7c6bd5aeb0 [formerly 0deb290c24] [formerly bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]]
Former-commit-id: 67c6f245a3e7e1a735bd5bfb5bb69221fe9e622b [formerly 0bbe51355e]
Former-commit-id: 241dfb9451
2013-03-11 13:00:44 -05:00
Nate Jensen
c3eee1d672 Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 5f343a50ae [formerly 21863c5db5] [formerly 5effcf2be10b9fa355b692253b6dde537d5459c4 [formerly d7902aba68]]
Former-commit-id: cee6519ae8def3eb8dd9176022e583ac56b8f782 [formerly a2f804350a]
Former-commit-id: d0bed867b0
2013-03-07 16:49:40 -06:00
David Gillingham
4310a7cf4c Issue #1447: Implement active table fetching, make bug fixes
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: c30aefd889 [formerly 75e82d9fca] [formerly 95f8074c97] [formerly c30aefd889 [formerly 75e82d9fca] [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 266c316c9c [formerly 94bccc87a3] [formerly 34ef93fbfd1261df01dfa61865a606e7d9a7141f [formerly 5ad72e2a7f]]
Former-commit-id: 28bcfe11ee679ce82c9ad55130e0004161f87c56 [formerly 2ca8e5e42a]
Former-commit-id: a1029acb7c
2013-03-06 14:23:00 -06:00
Dustin Johnson
a0635b7972 Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]]]
Former-commit-id: 3eddb2d286
Former-commit-id: 513f990a00 [formerly b88a1eefc1] [formerly 0344c84d1e8fbcb57eb5b9ad89e040c20ba5273c [formerly bfed4555a2]]
Former-commit-id: 2791098ecadf0bba6ab4f7ece1617303c52f766e [formerly f6431b52bf]
Former-commit-id: d28ff6d3c2
2013-03-05 13:32:04 -06:00
Steve Harris
2104c8b533 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00
Mike Duff
f82462f4a0 Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb

Former-commit-id: ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly 193cf1e54f [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]]
Former-commit-id: 193cf1e54f
Former-commit-id: e71d15f640 [formerly af84910ac6] [formerly 88e4de072ccfa6a5ea0a83518e7661b27952c198 [formerly 775a0e3edd]]
Former-commit-id: 15970d6c6fe94c1254b7558008541bf4e76fa5b3 [formerly 78953a3fd7]
Former-commit-id: ffbc3e4b9f
2013-03-05 11:26:54 -06:00
Steve Harris
f20c87110e 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Richard Peter
3ab85aa0f3 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]]
Former-commit-id: 784cd2145f
Former-commit-id: c7a4dcede6 [formerly a4bf42628a] [formerly 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]]
Former-commit-id: 1992cb2228c9c7acfe9a1445250fc5508b45c157 [formerly 6b08735982]
Former-commit-id: fa19a76a42
2013-03-04 17:48:05 -06:00
Dave Hladky
69e1b5f133 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]]
Former-commit-id: fc36146f48
Former-commit-id: f47935a03c [formerly 0f3c9ba997] [formerly 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]]
Former-commit-id: d37acb68d5f6f91395fa98f52c09dffd4dcce861 [formerly fc90d47619]
Former-commit-id: ac69f97305
2013-03-04 17:41:11 -06:00
Steve Harris
7a487645a9 Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit 9654c80906 [formerly 46ceab84c1] [formerly 60ba73c04c032b29fe9de5d4eedf3cbfefe3e10c [formerly c990477402]] [formerly 91d577f4db [formerly c5600acf79] [formerly cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]]] [formerly f4cccabc07] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]]].


Former-commit-id: f14f5aeb48 [formerly 7ffb42d6e6] [formerly 28391884a7] [formerly f14f5aeb48 [formerly 7ffb42d6e6] [formerly 28391884a7] [formerly fcb48a7280 [formerly 28391884a7 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]]]
Former-commit-id: fcb48a7280
Former-commit-id: 8d3a082908 [formerly f70ff93d2c] [formerly b5f56d7e152dca42f3283ef75e9eb4904563dd94 [formerly 9e87721b85]]
Former-commit-id: 861bc95c7454b6c8b3b9f97daa3e8cc09433781b [formerly 5baddd4678]
Former-commit-id: 04d09aba00
2013-03-04 13:03:19 -06:00
Steve Harris
749d6a1b89 Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
This reverts commit 62e364213a [formerly 312e2e07ae] [formerly 5b126ce31b7b2161f0bb83ad5035f926557f9ab1 [formerly eec5f87ab2]] [formerly 49fc025594 [formerly 348f5f0f41] [formerly 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]]] [formerly 35007e0460] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]]].


Former-commit-id: 702cec08bd [formerly 870972fb90] [formerly 88e633934d] [formerly 702cec08bd [formerly 870972fb90] [formerly 88e633934d] [formerly bba410a330 [formerly 88e633934d [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]]]
Former-commit-id: bba410a330
Former-commit-id: 9eeda5c82e [formerly ee2452f5d3] [formerly 537868d2ef13d960b8aa433851e48e3b6ee200fc [formerly 7d2286aea7]]
Former-commit-id: c2b8b73a414ef9ca8693e92fba589e6afefd1e54 [formerly f92b1e3534]
Former-commit-id: b71436dba8
2013-03-04 13:02:32 -06:00
Nate Jensen
ccc125751d Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
Former-commit-id: 64d504df91 [formerly 6bf2eefa2a] [formerly a90a2fe857] [formerly 64d504df91 [formerly 6bf2eefa2a] [formerly a90a2fe857] [formerly 677908868e [formerly a90a2fe857 [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]]]
Former-commit-id: 677908868e
Former-commit-id: ce0fb925d0 [formerly 75366a9e5a] [formerly aee05b7e732da38b5ee08c9a38d44908e5c23f93 [formerly 216e3d6ad3]]
Former-commit-id: 55067485ebfaa37ed3fc905f2fd5afa3e3797698 [formerly e7d6ad1036]
Former-commit-id: 38e747194a
2013-03-01 13:43:50 -06:00
David Gillingham
5d19a4dff7 Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: e2a7d7a350 [formerly ca81ae4a71] [formerly 50744c1f92] [formerly e2a7d7a350 [formerly ca81ae4a71] [formerly 50744c1f92] [formerly 9351f33c1c [formerly 50744c1f92 [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]]]
Former-commit-id: 9351f33c1c
Former-commit-id: 3b9b6e1df6 [formerly 622700dee9] [formerly 4b11b2a5ba7daa34582110049c00325dd999edb7 [formerly 77a3f33fd5]]
Former-commit-id: 3069edcf4f01f8ded0fff59250afd6a7b1fdfcc9 [formerly 4f6b2ffcff]
Former-commit-id: 861a3d0c44
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
b487a896ae Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]]
Former-commit-id: 9263ff1846
Former-commit-id: 9eb0c3e778 [formerly 8f4c2f2a39] [formerly 33c36155057aba55daf29a51f9519c3aef6b6940 [formerly 5a149c5dfa]]
Former-commit-id: 7b6491f72252fd10fa2101e74284719b65bbafb3 [formerly 77aef5f955]
Former-commit-id: c28a151884
2013-03-01 11:03:11 -06:00
Nate Jensen
62e364213a Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb

Former-commit-id: eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]]
Former-commit-id: 35007e0460
Former-commit-id: 49fc025594 [formerly 348f5f0f41] [formerly 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]]
Former-commit-id: 5b126ce31b7b2161f0bb83ad5035f926557f9ab1 [formerly eec5f87ab2]
Former-commit-id: 312e2e07ae
2013-03-01 10:48:03 -06:00
Nate Jensen
9654c80906 Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f

Former-commit-id: 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]]
Former-commit-id: f4cccabc07
Former-commit-id: 91d577f4db [formerly c5600acf79] [formerly cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]]
Former-commit-id: 60ba73c04c032b29fe9de5d4eedf3cbfefe3e10c [formerly c990477402]
Former-commit-id: 46ceab84c1
2013-03-01 10:12:56 -06:00
Bryan Kowal
cebfff6ed4 Issue #1662 - wrapper parameters can now be used to specify the order
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters

Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c

Former-commit-id: 1b65ae1967 [formerly 5b3478d6c7] [formerly 8bf5e3ffad] [formerly 1b65ae1967 [formerly 5b3478d6c7] [formerly 8bf5e3ffad] [formerly 44349717fb [formerly 8bf5e3ffad [formerly aae64b29491d8da0001cf1182a357683546d4593]]]]
Former-commit-id: 44349717fb
Former-commit-id: 5231011f8c [formerly 65fb00c3c3] [formerly f8cc7d08a49eb461437d41b449d73fc597f0f504 [formerly 4f7fed259c]]
Former-commit-id: 068a050daac80aaedf080f8ee26023ab9c3b91e8 [formerly dc46b8eeb1]
Former-commit-id: 8210c0d984
2013-02-27 12:46:48 -06:00
Ron Anderson
690755510b Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]]
Former-commit-id: f37999b1eb
Former-commit-id: dc8d1dd95c [formerly 541557e0b0] [formerly bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61]]
Former-commit-id: 431ce16b88c5fefb7469a176b83f3aee74719be9 [formerly 92abcad349]
Former-commit-id: 59c7ee5120
2013-02-26 18:44:51 -06:00
Nate Jensen
3e4c9990c0 Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development
Former-commit-id: 0cd78444b8 [formerly a020438c99] [formerly 58957d30e5] [formerly 0cd78444b8 [formerly a020438c99] [formerly 58957d30e5] [formerly 24c94ef55b [formerly 58957d30e5 [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]]
Former-commit-id: 24c94ef55b
Former-commit-id: ec7eecbb4f [formerly 652ac25d12] [formerly e65c9fe57e543cc92e2c686a843d870e73f0bdb8 [formerly b6fc51a18c]]
Former-commit-id: d60ecc846ff540e5dba00c4076dffbcedfcb8109 [formerly 841ddd8509]
Former-commit-id: 0ac9146923
2013-02-26 18:00:50 -06:00
Richard Peter
787b2e3afd Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments

Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462

Former-commit-id: 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 5b2650599d [formerly 9a0177861f [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]]
Former-commit-id: 5b2650599d
Former-commit-id: 0b51936566 [formerly ea806139d3] [formerly 34da74ced85f0f692350cc266348ad7532e0abff [formerly 4deaf372a1]]
Former-commit-id: a69b7f2df6d702e8f84d343464a46a7e090af1c1 [formerly e964d248fe]
Former-commit-id: 294914b403
2013-02-26 16:01:25 -06:00
Dustin Johnson
b24c3f23c7 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 88a9b953b6 [formerly 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]]
Former-commit-id: 88a9b953b6
Former-commit-id: c23b8a58c3 [formerly 94300e0c1d] [formerly 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03]]
Former-commit-id: 9b2a38cdff53a695ca327ed0c3edd1084fed67fd [formerly 2d6df74b67]
Former-commit-id: 6bb570ce5c
2013-02-26 15:06:04 -06:00
Nate Jensen
02b44369f4 Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
Former-commit-id: eb2e9f64f4 [formerly 15c4c4dfa0] [formerly b062299796] [formerly eb2e9f64f4 [formerly 15c4c4dfa0] [formerly b062299796] [formerly 36d4eff2c6 [formerly b062299796 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 5853f48992 [formerly b173d34ba9] [formerly 6b86c197517307ff2a80b25f90eb928605a06ecd [formerly 5c33098315]]
Former-commit-id: 3e677462839f8afaa67be1cf2099dee3fdc6466c [formerly c06d4abcee]
Former-commit-id: 360b33b854
2013-02-26 13:53:40 -06:00
Matt Nash
ab25be3e1c Issue #1668 add gsd pattern to allow for their plugins to be deployed
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6

Former-commit-id: 9dc4390b7e [formerly 41bbd4cf2d] [formerly a2fb0db684] [formerly 9dc4390b7e [formerly 41bbd4cf2d] [formerly a2fb0db684] [formerly 051b36ad73 [formerly a2fb0db684 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]]
Former-commit-id: 051b36ad73
Former-commit-id: 9ac60409d6 [formerly 32096feba8] [formerly ae09dddec53fb271e50dd90fd45b73f94ff690be [formerly b1fe380c44]]
Former-commit-id: f1dae5c4963ec5df64921535a8f7825033676c4f [formerly 1c51407ffd]
Former-commit-id: 2841c495af
2013-02-26 13:29:04 -06:00
Dustin Johnson
1b880d1178 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly 722e41b8b0 [formerly d58d28c636 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]]
Former-commit-id: 722e41b8b0
Former-commit-id: e6d447b00d [formerly 219e882fc5] [formerly 1fb58b752e38ec55f49ddf711fd9f47baf778025 [formerly cf86c92fad]]
Former-commit-id: 2e5f667d7ca6b4eeabba4faa28273511e86c137d [formerly b62631b9d1]
Former-commit-id: fa87f70100
2013-02-26 11:32:03 -06:00
Steve Harris
86c1edf4ea Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly e8135b9c14 [formerly b50e384a0f [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]]
Former-commit-id: e8135b9c14
Former-commit-id: e4b9ef2cd3 [formerly 901cbbf56d] [formerly 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85]]
Former-commit-id: 2360d951adc310ab576e9dbbb7077bb09c817c57 [formerly 1d8b6e0256]
Former-commit-id: 108abd5e69
2013-02-25 16:05:22 -06:00
Steve Harris
9d9a17aa64 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: f30d1cdf87 [formerly e46625f8f2] [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]]
Former-commit-id: 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950 [formerly 140ae3191c]
Former-commit-id: 9db68d0585
2013-02-25 15:58:48 -06:00
Bryan Kowal
e9cbfb8c57 Issue #1634 - fix EDEX debug with YAJSW Wrapper
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

Former-commit-id: 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 0d2262c0bf [formerly b05073fbe3 [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f4bf7e1adb [formerly f8c920c6cd] [formerly 090c61777cb5dad1fa90214f62e271692c5b167e [formerly 36a887416f]]
Former-commit-id: 4279afad443b9b6aab6051e4b7a738fe37ac5e91 [formerly ebe04d4919]
Former-commit-id: e38658e939
2013-02-25 11:30:13 -06:00
Mike Duff
d1fec7bb15 Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]]
Former-commit-id: 81649d346a
Former-commit-id: 5439b30b6a [formerly 01ef273417] [formerly 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]]
Former-commit-id: 0b55db4b6b45148de1eef1eb4f0dbf9090315261 [formerly a92492ed07]
Former-commit-id: 383f5c075e
2013-02-25 09:29:16 -06:00
Steve Harris
02f04a926e 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 30efc4c86a [formerly 05eb25f124] [formerly ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]]
Former-commit-id: 1fe55774d4f2229cf3fdf3a4a342eab88f5b63cd [formerly 1ba778753f]
Former-commit-id: 9da8db0212
2013-02-25 10:24:53 -05:00
Steve Harris
dbaeb28c82 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
2013-02-25 10:18:36 -05:00
Dustin Johnson
3b3b786990 Issue #1543 Make DAOs public
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a

Former-commit-id: 5a4dd6fbd1 [formerly d4186178af] [formerly 06b7697553] [formerly 5a4dd6fbd1 [formerly d4186178af] [formerly 06b7697553] [formerly 0743782772 [formerly 06b7697553 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]]]
Former-commit-id: 0743782772
Former-commit-id: 637c7e62c2 [formerly a1df296e80] [formerly 0129926124bc6953a319174f4ae9c67d11da1444 [formerly 4e87912a9c]]
Former-commit-id: 965e4e0af9cf9b0047bca78a7973aae1c9c8e32a [formerly 0d9f121548]
Former-commit-id: 2e513ab5ac
2013-02-22 12:22:43 -06:00
Bryan Kowal
18b7aaed49 Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]]
Former-commit-id: d5c8b82941
Former-commit-id: ec53fa98cd [formerly 53b9e69868] [formerly e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010]]
Former-commit-id: e900cecc385d0b35cf2613204f84c8aac131bc81 [formerly fd17273cb2]
Former-commit-id: dd7eda15aa
2013-02-22 09:28:37 -06:00
Steve Harris
34d0f59592 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
2013-02-21 15:41:39 -06:00
Bryan Kowal
55b55a1255 Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...


Former-commit-id: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6a47017449 [formerly b2a0a7c148] [formerly 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]]
Former-commit-id: 302b1a5ae96498f9e93f50ccd303b89ce6085fa5 [formerly 2a21f2624b]
Former-commit-id: b88a24574b
2013-02-21 13:55:28 -06:00
Nate Jensen
9a8f71c7a8 Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
Former-commit-id: ec0dd8d234 [formerly b2f7cbcbe3] [formerly 7dbeeb2684] [formerly ec0dd8d234 [formerly b2f7cbcbe3] [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 7dbeeb2684 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]]]
Former-commit-id: c6896b5676
Former-commit-id: b423cd4d70 [formerly 533deac8d0] [formerly 97c5442369f13721659c1b0c23d03bc01ac6815a [formerly 4f4932b014]]
Former-commit-id: 77cef9f4ba08ffa9f29d10832751a4bf7db8f0f2 [formerly 0f92e92c18]
Former-commit-id: d4268d6086
2013-02-21 11:47:00 -06:00
Nate Jensen
a29dcc879f Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly 73f53bd513 [formerly a9c4e54287 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]]
Former-commit-id: 73f53bd513
Former-commit-id: e19664ab18 [formerly 6f9d3f55e5] [formerly 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34]]
Former-commit-id: 280cd5c23fc512c656015c651483ee802f2f1629 [formerly 767596401f]
Former-commit-id: 98e5133a1c
2013-02-21 11:41:52 -06:00
Steve Harris
067dfcb980 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 96c7269df0 [formerly 0569ff413d] [formerly c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]]
Former-commit-id: a43ccc92cdffebafcecdfdadcfc25825beb32b12 [formerly 654f15be5c]
Former-commit-id: 07e4e4c8fb
2013-02-21 09:36:59 -05:00
Steve Harris
fac2d20002 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Dustin Johnson
2a9f20fca7 Merge "Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO - Change new registry modes to explicitly list includes/excludes. - Add separate bandwidth manager creation capabilities for NCF and WFO. - Add deltaScript to add a "route" slot to subscriptions. - Remove unnecessary schemas from Spring files." into development
Former-commit-id: 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly cb1380af90 [formerly a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]]]
Former-commit-id: cb1380af90
Former-commit-id: 18cfc1ee4d [formerly f552967bf3] [formerly 48d8590ebfaa96f41ee4b9def3d4c9a8b17d1c3c [formerly 5031ae4d66]]
Former-commit-id: 8a3326929ccb7815ac1878648083e7db49810bb1 [formerly d62153b1b4]
Former-commit-id: a5a2f437f9
2013-02-20 16:17:20 -06:00
Dave Hladky
94b8025274 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: f439b63316 [formerly 261d00c544] [formerly 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]]
Former-commit-id: bcadc59b9fd827ba70895359ecdc846ddaa9d826 [formerly cd74938355]
Former-commit-id: 87cfb35394
2013-02-20 16:13:08 -06:00
Ben Steffensmeier
7a930f49eb Issue #1628 clean up Inflaters used by HttpClient.
Former-commit-id: 8cb150a0e9 [formerly 0e9226b5f5] [formerly ef2dd2a031] [formerly 8cb150a0e9 [formerly 0e9226b5f5] [formerly ef2dd2a031] [formerly e2efad85fe [formerly ef2dd2a031 [formerly 765b3b00362cbe9a5d6c3e392e005b42d968d268]]]]
Former-commit-id: e2efad85fe
Former-commit-id: 9d34dce3de [formerly 0f1057cb3d] [formerly 8365e04958c1ccf70f03afee22501ef446beba5f [formerly 2debab14f5]]
Former-commit-id: e533c5fbc2db6246d3a0e81135af9a09ee340782 [formerly cc0dcc8eae]
Former-commit-id: 63cf7e3cb9
2013-02-20 12:58:13 -06:00
Roger Ferrel
0ab8a42f96 Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools.
Change-Id: Iac6a4453c06d571f9462db9074b81434e1b5f45f

Former-commit-id: c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly dd05bc65be [formerly 8baa3b6df5 [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]]]]
Former-commit-id: dd05bc65be
Former-commit-id: 672a979183 [formerly e47c91eda7] [formerly bb8e979b980b2c5128f11b8e520f639e237ea72a [formerly 8264adc47d]]
Former-commit-id: 7942c7b0e437e39d63fc331211541bf727eae1cf [formerly 70dae3453a]
Former-commit-id: cdbebf0743
2013-02-20 12:09:26 -06:00