xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5377 commits 31 branches 40 tags 3.8 GiB
Commit graph

501 commits

Author SHA1 Message Date
Nate Jensen
ff64bf589b Issue make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml 
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]
Former-commit-id: afae330d8a
 2013-06-19 10:16:06 -05:00
Dustin Johnson
27a2717d88 Issue Separate log purging to its own Spring file for datadelivery/dpa 
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

Former-commit-id: 89a179ab97 [formerly 1e7c85a592] [formerly 1494a604ae1cff7c7ecb8ca757c674dc2c661557 [formerly 6f8246262b]] [formerly 314331c9a4 [formerly 6f8246262b [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]]
Former-commit-id: 314331c9a4
Former-commit-id: cb5dabe6a8d083d3beec439c06b863290f719aae [formerly dab308afc8]
Former-commit-id: a0d8e1dc0c
 2013-06-19 08:56:43 -05:00
Dustin Johnson
4c23003a5d Merge "Issue Improved MADIS ingest to be more resource frugal, target version fixed" into development 
Former-commit-id: aea6f77189 [formerly d6bedc07ce] [formerly 8d139f3325] [formerly 2e1d54e686 [formerly 8d139f3325 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]]
Former-commit-id: 2e1d54e686
Former-commit-id: 7f1baebdce79cdc1ab1c8680e9b864edf47193f9 [formerly 728f54c6ea]
Former-commit-id: b2cb6803fd
 2013-06-18 13:55:51 -05:00
Dave Hladky
77f69d29f4 Issue Improved MADIS ingest to be more resource frugal, target version fixed 
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8

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

Former-commit-id: e8511a53ad [formerly b9d8e444b3] [formerly 9bc7c854ab] [formerly 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]
Former-commit-id: 7ee918a548
Former-commit-id: 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2]
Former-commit-id: e7a679ebc7
 2013-06-18 12:34:25 -05:00
Bryan Kowal
d9ff78a1e2 Issue - export EDEX_BITS earlier 
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: 2651970e62 [formerly da49d311e9] [formerly 0e01520e11] [formerly 9b1596dc0c [formerly 0e01520e11 [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]]
Former-commit-id: 9b1596dc0c
Former-commit-id: b72275bbcb2a5822e5cb67fccf4f28d45460d357 [formerly abd96b92b7]
Former-commit-id: f5af2ea95e
 2013-06-17 15:57:18 -05:00
Steve Harris
324532d6ac Merge branch 'omaha_13.5.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]
Former-commit-id: 251b3c1a9e
 2013-06-17 15:29:01 -05:00
Steve Harris
a5fb9b721d Merge branch 'master_13.5.1' into omaha_13.5.1 
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: dadf03acaf [formerly 41748175b6] [formerly 8a27d96b844873d84abafe2421e8bfc28bd9b9a6 [formerly 97631f9c62]] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]
Former-commit-id: 0e4504c0fa
 2013-06-17 15:25:32 -05:00
Steve Harris
0f83e19dab 13.5.1-2 baseline 
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]
Former-commit-id: ccd66c0724
 2013-06-17 15:01:22 -04:00
Dave Hladky
2aa7d84313 Issue Subscription retrieval for WFS (MADIS) follow on of , for 13.6.1 
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a

Former-commit-id: a4bf580fef [formerly d1cd0938a6] [formerly e48e4eeb69] [formerly 752f7106bc [formerly e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]]]
Former-commit-id: 752f7106bc
Former-commit-id: 79c6ea13ea470ea7f499f58fd8dcfb39b4c0650f [formerly 608c43b64a]
Former-commit-id: 456db39e63
 2013-06-14 12:29:08 -05:00
Dave Hladky
baa2c23f7c Issue Subscription retrieval for WFS (MADIS) follow on of , for 13.6.1 
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 5512104d86 [formerly 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]]
Former-commit-id: 5512104d86
Former-commit-id: ca6f59dfbdf94182cc17eec76951e9fefb7a9546 [formerly b401764a23]
Former-commit-id: 8d0d10a4f1
 2013-06-13 22:13:49 -05:00
Nate Jensen
f173cc29e1 Issue improve error handling on thrift or http errors 
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]
Former-commit-id: 4a39d586d2
 2013-06-13 11:39:30 -05:00
Dustin Johnson
7dad7f34a3 Issue Create Data Provider Agent feature 
Amend: Remove dataplugins feature from dataprovideragent

Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901

Former-commit-id: 915278ace0 [formerly fd61a1e056] [formerly e33cd9d00d] [formerly 45600f3d55 [formerly e33cd9d00d [formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]]
Former-commit-id: 45600f3d55
Former-commit-id: 700842421dc70a3d47106ec397a39fb8c2b4a20f [formerly dfdfbe642b]
Former-commit-id: e617f569ff
 2013-06-12 15:41:32 -05:00
Nate Jensen
196e111978 Issue fix wrapper.conf 
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: bf7b56460b [formerly dae8945d1a] [formerly 30f9bba5c4] [formerly 08eb034abc [formerly 30f9bba5c4 [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]]
Former-commit-id: 08eb034abc
Former-commit-id: b8cfd5aa892536823fe2becc29ee2fb4824b6c94 [formerly 53784c5a86]
Former-commit-id: 8516c28fdf
 2013-06-12 14:05:15 -05:00
Steve Harris
43b7a9b410 13.5.1-1 baseline 
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
 2013-06-10 15:17:17 -04:00
Greg Armendariz
72e73cc94b Merge "Issue - remove obsolete files" into development 
Former-commit-id: 5313236e3b [formerly e220ed1ae4] [formerly 367d9850b3] [formerly afed5f12a0 [formerly 367d9850b3 [formerly e19a1da294b9d0e34c126537a13a12e8aba8f35f]]]
Former-commit-id: afed5f12a0
Former-commit-id: 18d9aa0dea483e977a5b69c7e4bd165908d70492 [formerly 61d6d42121]
Former-commit-id: e9aea7130e
 2013-06-06 16:49:05 -05:00
Bryan Kowal
24e5e2a8ff Issue - remove obsolete files 
Former-commit-id: 844b1ed072 [formerly 6aecf2370f] [formerly 6d642232dd] [formerly 4962310360 [formerly 6d642232dd [formerly 00f7ba0212f84db3b36805e2dcc2790d67fcfaac]]]
Former-commit-id: 4962310360
Former-commit-id: 496dfd9d90da0c9a9e5d0f30aa352d85ec73818f [formerly fee1818521]
Former-commit-id: fa1add535d
 2013-06-06 16:35:04 -05:00
David Gillingham
3dca4cce4c Issue : Pure python client implementation of Data Access Framework. 
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427

Former-commit-id: 98b288f275 [formerly 2c0af328b6] [formerly ae3e7a64b0] [formerly 4bdf7178bd [formerly ae3e7a64b0 [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 9db7659ae79bb9f296e845275e0f20ae041ad376 [formerly 3f4b44fbbc]
Former-commit-id: 242d3a5493
 2013-06-06 13:47:31 -05:00
Bryan Kowal
6c368db5e0 Issue - defined a hibernate log that all hibernate errors would be redirected to. 
Former-commit-id: b7b51697b8 [formerly 3427534c29] [formerly 4b5c653363] [formerly 2abb257d35 [formerly 4b5c653363 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]
Former-commit-id: 2abb257d35
Former-commit-id: 11d840385012f6641f89c0e54c9c442aed3c2d11 [formerly 98150aa493]
Former-commit-id: b3b85069ea
 2013-06-04 18:25:58 -05:00
Dustin Johnson
8df55423f5 Issue Fix ability to get shared subscriptions by id 
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly 05bd3e113d [formerly fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]
Former-commit-id: 05bd3e113d
Former-commit-id: e9924f52a848d24038a0a3fb3705c0ff67f9a02e [formerly 42d1d74b04]
Former-commit-id: 3f4b010b84
 2013-05-31 09:29:44 -05:00
Dustin Johnson
5d995a726f Merge "Issue Sister ticket to , WFS retrieval impl for MADIS" into development 
Former-commit-id: f3835a5670 [formerly 54045d6b9b] [formerly c01ea33d5b] [formerly e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: f7a467f666496a4ca4ff1bd58f5061cc1b7eb62c [formerly 58b11e075c]
Former-commit-id: 353630fcca
 2013-05-30 17:11:19 -05:00
Dave Hladky
e28331d3bb Issue Sister ticket to , WFS retrieval impl for MADIS 
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 7393abfc91 [formerly c292bf1b55] [formerly 1608d407d1] [formerly 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]
Former-commit-id: 83dae4fe01
Former-commit-id: 724bfb742a41ede685551f3df79514daaee58c8b [formerly 90e6d184e7]
Former-commit-id: 64596d3468
 2013-05-30 17:04:16 -05:00
Nate Jensen
09215e6dbb Merge "Issue Fix FeatureExplorer feature comparison" into development 
Former-commit-id: 03833d148d [formerly 10dd7ea61f] [formerly 4aa3657d1a] [formerly e4578ca7ba [formerly 4aa3657d1a [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]]
Former-commit-id: e4578ca7ba
Former-commit-id: 86618d2ea904ba85327447d5180c4eef0264924d [formerly c0bca7ec27]
Former-commit-id: 698d793e9c
 2013-05-30 14:50:39 -05:00
Steve Harris
e83fa33a36 Issue - Merge branch 'vlab' into development 
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]
Former-commit-id: 26bf27c70d
Former-commit-id: 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]
Former-commit-id: 629e76e0ff
 2013-05-30 14:33:24 -05:00
Everett Kladstrup
f78c5c3640 Issue Fix FeatureExplorer feature comparison 
* fixes complaint when feature A includes features B and C
  which both include feature D.
  Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change

Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7

Former-commit-id: 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]
Former-commit-id: 4621271329
Former-commit-id: 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141]
Former-commit-id: 282ec3b45f
 2013-05-30 13:02:49 -05:00
Dustin Johnson
ac8c2784ae Issue Remove unused schemas from datadelivery spring files 
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]
Former-commit-id: 74d985af51
 2013-05-30 09:49:09 -05:00
Bryan Kowal
cad451315d Issue - foss jars that have associated source code will no longer be removed from the distribution 
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14

Former-commit-id: 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]]
Former-commit-id: bd9251eba0
Former-commit-id: 12f6e2d4de44a38803b3d5a550206ae1507ca67f [formerly 4eb7d951e4]
Former-commit-id: 5ee9c9f6a1
 2013-05-29 21:52:10 -05:00
Nate Jensen
fde771fa01 Issue remove unused schemas 
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]
Former-commit-id: ab10e0072d
 2013-05-29 16:19:28 -05:00
Nate Jensen
3a41ae85b4 Issue update spring xsd references to 3.1, fix ingestDat.sh 
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
 2013-05-29 14:49:43 -05:00
Nate Jensen
043cc9f661 Issue remove high memory mode, reorganize wrapper.conf 
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3]
Former-commit-id: 47d2bf99b9
 2013-05-29 12:06:15 -05:00
Benjamin Phillippe
a05a910ef9 Issue Implemented federated query capabilities 
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly e7f17cb73caba0c3830169a9b341f90b58134c89 [formerly 4747f7d319]] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]
Former-commit-id: d5263b2b75
Former-commit-id: c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794]
Former-commit-id: c6af8b4d7c
 2013-05-29 10:34:22 -05:00
Dustin Johnson
6567c1b6ef Merge "Issue More information when bandwidth manager can't schedule a subscription" into development 
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]
Former-commit-id: b6c87f42b1
 2013-05-29 09:27:30 -05:00
Nate Jensen
768a7dad60 Issue remove wrapper.conf properties that are just passthroughs from env variables 
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]
Former-commit-id: 452858b86f
 2013-05-29 09:20:53 -05:00
Dustin Johnson
fb15a3e115 Issue More information when bandwidth manager can't schedule a subscription 
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]
Former-commit-id: fff0172786
 2013-05-29 09:02:47 -05:00
Nate Jensen
3b56918970 Issue remove activemq references from spring xml, fix deprecated javadoc 
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
 2013-05-23 11:20:40 -05:00
Richard Peter
b087cac180 Merge "Issue fix clustered routes suspending/starting" into development 
Former-commit-id: 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: e52295b07065a9723da62e04d0bd89a3ddba7ec9 [formerly 7a02b90690]
Former-commit-id: e150a51871
 2013-05-23 10:10:51 -05:00
Matt Nash
e9735dc410 Issue fix for 64 bit ints from Python to Java 
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: 98364944a63f530252908f2eab510fc15f4a9823 [formerly ca208f913c]
Former-commit-id: 230e3d149e
 2013-05-23 09:07:56 -05:00
Bryan Kowal
0f23a3a390 Issue - patch ant includegen task 
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]
Former-commit-id: e6cfad1759
 2013-05-22 18:00:43 -05:00
Nate Jensen
1aa7bda4f9 Issue fix clustered routes suspending/starting 
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]
Former-commit-id: a6d525ec96
Former-commit-id: b2203d5e824a80b3594b409d049bc1148ae5c2d7 [formerly 431e97742d]
Former-commit-id: 5525412779
 2013-05-22 16:39:24 -05:00
Benjamin Phillippe
99ed99e6d3 Issue Added registry federation capabilities 
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]
Former-commit-id: c3a376475b
Former-commit-id: 97b5016d0f29b44e02a2e20c7079fd9348e0adf5 [formerly ad039bae0c]
Former-commit-id: 1c50a8b9d3
 2013-05-22 11:38:42 -05:00
Richard Peter
ffe0b35085 Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]
Former-commit-id: 76f11f00ae
 2013-05-21 12:11:21 -05:00
Richard Peter
8e252f89f0 Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]
Former-commit-id: 21b87e9ea7
 2013-05-21 10:35:00 -05:00
Bryan Kowal
0ad544cd3e Issue - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE. 
Former-commit-id: 3a5ae717cb [formerly 081d1c724a] [formerly 99ba7adfe7] [formerly e4874a873a [formerly 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]
Former-commit-id: e4874a873a
Former-commit-id: e1ec52afdddf5b48f29ce53fbeaaa24e087bb331 [formerly 31605b7a94]
Former-commit-id: 3f20eed975
 2013-05-20 15:03:33 -05:00
Steve Harris
ac83fff244 13.4.1-10 baseline 
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]
Former-commit-id: 7e04d8cd13
 2013-05-20 10:52:47 -04:00
Richard Peter
f186912fe1 Merge branch 'omaha_13.4.1' (13.4.1-9) into development 
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]
Former-commit-id: aff520d61b
 2013-05-17 10:33:18 -05:00
Nate Jensen
009ed8605d Issue disable camel JMX to speed up edex 
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]
Former-commit-id: d905453660
Former-commit-id: 29c74ab437171949434e0b34fa54e7aeadcdb266 [formerly c3bafc88cd]
Former-commit-id: b57c84d12b
 2013-05-16 17:13:46 -05:00
Steve Harris
9b898a6478 Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: f9535abb10 [formerly 87a31f9990] [formerly 16ba74496d] [formerly b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615]
Former-commit-id: b5d3ff1867
 2013-05-16 13:45:58 -05:00
Nate Jensen
d71f246645 Issue remove dead files 
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly ce2579a289 [formerly 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]
Former-commit-id: ce2579a289
Former-commit-id: 2076bee14faf74bd27ac75d44642ca376db29ce9 [formerly 04c7c4a4da]
Former-commit-id: 53f994c0a8
 2013-05-16 10:25:38 -05:00
Steve Harris
7d55d0e959 13.4.1-9 baseline 
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]
Former-commit-id: 67a95d07d2
 2013-05-16 11:12:07 -04:00
Nate Jensen
fb7be885b0 Issue removing unused jars 
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 9069cdd6843363f31f735d05691b1d9c3ac3ae91 [formerly 0234e6788b]
Former-commit-id: 6caa681ed3
 2013-05-15 14:44:30 -05:00