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

2172 commits

Author SHA1 Message Date
Richard Peter
d53d7d0c0d Issue #2051: Fix Shef PurgeText 
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: c0c4dad633 [formerly 97fe8bd24b] [formerly c0c4dad633 [formerly 97fe8bd24b] [formerly a2028de5bc [formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]]
Former-commit-id: a2028de5bc
Former-commit-id: f75acec79c [formerly 86d08ef574]
Former-commit-id: ceaca5b674
 2013-12-03 11:41:22 -06:00
Richard Peter
90e23f5c6b Issue #2170: Update Plugin Notification Framework 
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: 5905c5d08d [formerly 2085a9cd33] [formerly 5905c5d08d [formerly 2085a9cd33] [formerly fbda83aeb9 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 670e63d0dd [formerly f7f9a4e57c]
Former-commit-id: ff5fbcf012
 2013-12-03 11:41:21 -06:00
Richard Peter
b5962b7f06 Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development 
Former-commit-id: 829744ced9 [formerly 10f32b5fc7] [formerly 829744ced9 [formerly 10f32b5fc7] [formerly 02b11b3509 [formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]]
Former-commit-id: 02b11b3509
Former-commit-id: 35d4e7239f [formerly 3113fe26cd]
Former-commit-id: ceccd412dc
 2013-12-02 16:52:40 -06:00
Nate Jensen
da9d1b2447 Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup 
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 9b3f871c21 [formerly 6bf1fd8d3c] [formerly 9b3f871c21 [formerly 6bf1fd8d3c] [formerly 72c322c667 [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]]
Former-commit-id: 72c322c667
Former-commit-id: 476f9da5ad [formerly 2831ceb356]
Former-commit-id: cbd12d4cc7
 2013-12-02 16:10:26 -06:00
Steve Harris
bfa9d638cc 14.1.1-11 baseline 
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
 2013-12-02 17:10:10 -05:00
Brad Gonzales
5bebc39d29 Issue #2541 Added exclude patterns to RequestPatterns. 
Added an exclude pattern to grib.xml to exclude data delivery sbn files.

Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521

Former-commit-id: abafd2bc13 [formerly dc7e255d43] [formerly abafd2bc13 [formerly dc7e255d43] [formerly 8acfa99e77 [formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]]
Former-commit-id: 8acfa99e77
Former-commit-id: f25d05d871 [formerly dd8eb8c2b4]
Former-commit-id: c596c6f672
 2013-12-02 11:44:09 -06:00
Benjamin Phillippe
b39ef6ca2b Issue #2534 Added reciprocated registry replication subscriptions 
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: f4144fca06 [formerly 212bbeb379] [formerly f4144fca06 [formerly 212bbeb379] [formerly 31b53f4ad9 [formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 495f70a5cf [formerly 2fa17aab7f]
Former-commit-id: 878f9fe3ea
 2013-11-27 12:07:59 -06:00
Nate Jensen
e6c012c071 Merge "Issue #2537 point data code cleanup." into development 
Former-commit-id: de593896f8 [formerly 9a4a4fba2d] [formerly de593896f8 [formerly 9a4a4fba2d] [formerly d9ab670d45 [formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]]
Former-commit-id: d9ab670d45
Former-commit-id: 1326b0ec0f [formerly 0a936e860a]
Former-commit-id: 3b00fc37a5
 2013-11-26 17:48:53 -06:00
Ben Steffensmeier
d06d42ec24 Issue #2528 Allow geostationary data to display on an identical projection. 
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 5369a757ce [formerly 048f968147] [formerly 5369a757ce [formerly 048f968147] [formerly 59d806fa7e [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]
Former-commit-id: 59d806fa7e
Former-commit-id: a78188ecb9 [formerly 37f6acbb99]
Former-commit-id: 14d7341d68
 2013-11-26 17:38:29 -06:00
Ben Steffensmeier
38ca6a726c Issue #2574 Fix conversion of null grid coverage in dataURI. 
Former-commit-id: e639a00fd8 [formerly 21f0abbca1] [formerly e639a00fd8 [formerly 21f0abbca1] [formerly 6d14edd0a8 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]]
Former-commit-id: 6d14edd0a8
Former-commit-id: c300d0ee8a [formerly 089bdf97cb]
Former-commit-id: 63d163c00e
 2013-11-26 15:19:31 -06:00
Ben Steffensmeier
b29fbe64a8 Issue #2537 point data code cleanup. 
Former-commit-id: 42107fba5c [formerly a4e3a4a03b] [formerly 42107fba5c [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: a4e3bf34b8 [formerly 62ca7b1df6]
Former-commit-id: 8c386a2aac
 2013-11-26 15:16:54 -06:00
Ben Steffensmeier
5ee4468108 Issue #2574 Add DataURIFieldConverter for GridCoverages. 
Former-commit-id: cf6ef77d78 [formerly 08be03d3fa] [formerly cf6ef77d78 [formerly 08be03d3fa] [formerly bdb0e111ea [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]
Former-commit-id: bdb0e111ea
Former-commit-id: d8f5e957d3 [formerly f7b1015dca]
Former-commit-id: b1de6a34eb
 2013-11-25 12:17:36 -06:00
Ben Steffensmeier
d307af23eb Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images 
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 8a7d3ceab1 [formerly 927801985a] [formerly 8a7d3ceab1 [formerly 927801985a] [formerly 3696896b49 [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: ca5e771451 [formerly 70ca78c7b5]
Former-commit-id: a3f5fcabf6
 2013-11-25 11:31:57 -06:00
Dave Hladky
2e254e0208 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display 
Former-commit-id: 233238d8df [formerly 04c7e2cffc] [formerly 233238d8df [formerly 04c7e2cffc] [formerly a9a3973319 [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: cebf79ad44 [formerly ebd6d5cbe1]
Former-commit-id: 54af53ffb4
 2013-11-21 14:46:47 -06:00
Nate Jensen
ce8dd7468d Merge "Issue #2448 Fixed problem that set subscription start time to first cycle time. Fixed problem that set subscription end time to end of day." into development 
Former-commit-id: ab96dde78a [formerly 982a664301] [formerly ab96dde78a [formerly 982a664301] [formerly 695262552f [formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]]
Former-commit-id: 695262552f
Former-commit-id: 3d8c69c800 [formerly 198ff37bd7]
Former-commit-id: eb0f52cfca
 2013-11-21 08:36:59 -06:00
Brad Gonzales
65eefe2846 Issue #2448 Fixed problem that set subscription start time to first cycle time. 
Fixed problem that set subscription end time to end of day.

Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65

Former-commit-id: c7959336f5 [formerly 93b47ce68b] [formerly c7959336f5 [formerly 93b47ce68b] [formerly d2cfc5986a [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]
Former-commit-id: d2cfc5986a
Former-commit-id: 4a83ff7971 [formerly 04d7bff784]
Former-commit-id: 70f66e5f7a
 2013-11-20 15:49:27 -06:00
Ben Steffensmeier
67b724a541 Issue #2528 Add brute force method of calculating geostationary envelope intersections. 
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf

Former-commit-id: 9627cf0f6f [formerly 30d125f95a] [formerly 9627cf0f6f [formerly 30d125f95a] [formerly 00af766143 [formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 00af766143
Former-commit-id: abdb1c504c [formerly 6faafa2dfc]
Former-commit-id: c742abd06e
 2013-11-20 15:36:27 -06:00
Greg Armendariz
5d5f7c9d44 Merge "Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring. Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription handlers will be injected through spring. Removed the SBN route from wfo mode." into development 
Former-commit-id: 6efadcdeed [formerly 93daf9aff4] [formerly 6efadcdeed [formerly 93daf9aff4] [formerly bc6c4e2b32 [formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: dd31a09cf9 [formerly ce2ef25207]
Former-commit-id: c94e59646b
 2013-11-20 12:26:30 -06:00
Brad Gonzales
fc4850d7b2 Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added 
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode.  Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events.  Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files.  Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring.  Removed the SBN route from wfo mode.

Amend: Comment updates from peer review.

Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8

Former-commit-id: 5576ac6134 [formerly 053f20c70b] [formerly 5576ac6134 [formerly 053f20c70b] [formerly 95a1914c71 [formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]
Former-commit-id: 95a1914c71
Former-commit-id: 3c86e33ea4 [formerly 04829d37e2]
Former-commit-id: 6e19c4dab1
 2013-11-20 11:58:33 -06:00
Brian Clements
6b8a853240 Issue #2393 removed pypies interpolation 
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: d35fc591d2 [formerly fe58826a1e] [formerly d35fc591d2 [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 10e63616ff [formerly b762864f88]
Former-commit-id: 2e4dc2000e
 2013-11-20 08:40:12 -06:00
Bryan Kowal
ce6f126469 Issue #2552 - replace Logger with UFStatus 
Former-commit-id: c938d03deb [formerly ff968c9884] [formerly c938d03deb [formerly ff968c9884] [formerly 0bdb25bf43 [formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: be5b0b83c9 [formerly da148196ac]
Former-commit-id: 91367f57b6
 2013-11-19 17:11:36 -06:00
Steve Harris
ea65181d19 14.1.1-10 baseline 
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
 2013-11-19 16:40:25 -05:00
Nate Jensen
dcf7114d6b Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development 
Former-commit-id: 50590a241f [formerly 6927e960b2] [formerly 50590a241f [formerly 6927e960b2] [formerly 5885d8027b [formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]
Former-commit-id: 5885d8027b
Former-commit-id: aba433c4bb [formerly be3d016f93]
Former-commit-id: 0015c66955
 2013-11-19 11:25:19 -06:00
Nate Jensen
7e76b097c7 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development 
Former-commit-id: 93e93de742 [formerly 4f47800cae] [formerly 93e93de742 [formerly 4f47800cae] [formerly 0146ae59df [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d9d0eb7354 [formerly a238ba2ba3]
Former-commit-id: 951c1ff2f3
 2013-11-18 11:39:12 -06:00
Brad Gonzales
2c7e62ee89 Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications. 
Added missing comma to com.raytheon.edex.plugin.text.

Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162

Former-commit-id: 938683ba4d [formerly aa8fb36fc1] [formerly 938683ba4d [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 4ec5ee7f74 [formerly 490c95d010]
Former-commit-id: 4499a8d1de
 2013-11-15 08:00:47 -06:00
Nate Jensen
2e81364691 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE 
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 757ca42a5f [formerly dd99aa3f47] [formerly 757ca42a5f [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d0d712ec6f [formerly d96cdbe761]
Former-commit-id: f2c777ff48
 2013-11-14 17:41:24 -06:00
Richard Peter
8247da7774 Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development 
Former-commit-id: 157e739623 [formerly 14b1e924a1] [formerly 157e739623 [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 65e8ad1a62 [formerly 1a7dd7723b]
Former-commit-id: 38d2c6564a
 2013-11-14 17:21:48 -06:00
Brian Clements
1a2b934e97 Issue #2361 fixed ncwf hibernate pickup 
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: 55682480e1 [formerly cacdf313c5] [formerly 55682480e1 [formerly cacdf313c5] [formerly 00490c2db2 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 878a677d18 [formerly ab24330f23]
Former-commit-id: e7c355df52
 2013-11-14 17:12:02 -06:00
Mike Duff
769e81cd23 Issue #2548 - Add a subscription type slot for uniqueness. 
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 8cc9c1de59 [formerly 47011a70db] [formerly 8cc9c1de59 [formerly 47011a70db] [formerly 47a0477587 [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 44cc3d8776 [formerly b929b7aa02]
Former-commit-id: 5fdf101af6
 2013-11-14 17:07:54 -06:00
Nate Jensen
f6abd529f7 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development 
Former-commit-id: 3b11ea8c5b [formerly b4bcd14a85] [formerly 3b11ea8c5b [formerly b4bcd14a85] [formerly c2aacfc437 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]
Former-commit-id: c2aacfc437
Former-commit-id: f0a0287230 [formerly a8a1e396fe]
Former-commit-id: 7ec18ba0b1
 2013-11-14 16:34:28 -06:00
Bryan Kowal
bc25cbe7ad Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring. 
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration

Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0

Former-commit-id: 782675951b [formerly be78fab116] [formerly 782675951b [formerly be78fab116] [formerly ce16efc9a1 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 512fc1a7c1 [formerly a6ea71d46f]
Former-commit-id: 4275b195ce
 2013-11-14 15:17:28 -06:00
Richard Peter
2025e073ef Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 800effdc5a [formerly 8fb79e7b73] [formerly 800effdc5a [formerly 8fb79e7b73] [formerly c42f931118 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]
Former-commit-id: c42f931118
Former-commit-id: e5dc8e2027 [formerly 2b95bcfb31]
Former-commit-id: e7d8e5e560
 2013-11-14 14:56:59 -06:00
Richard Peter
705339a320 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
 2013-11-14 14:40:23 -06:00
Lee Venable
ab512eaeb1 Merge "Issue #2540 - pure python module merge implementation" into development 
Former-commit-id: 6086c06f66 [formerly d431f3c0f4] [formerly 6086c06f66 [formerly d431f3c0f4] [formerly bc7f5e556d [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 69934b9b32 [formerly 17fef206fc]
Former-commit-id: 84de0beae4
 2013-11-14 14:33:18 -06:00
Richard Peter
7375a3b961 Merge "Issue #2505 removed recco from deployment" into development 
Former-commit-id: 5c5e71a01b [formerly 4d18c7d493] [formerly 5c5e71a01b [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 6af248f212 [formerly 3dc0ad184c]
Former-commit-id: ace2a71092
 2013-11-14 13:30:09 -06:00
Nate Jensen
6441290b40 Issue #2361 remove StyleManager's use of SerializationUtil and 
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: a4eb19fc79 [formerly 9acda0b9f2] [formerly a4eb19fc79 [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: e41f57da67 [formerly a6be904c69]
Former-commit-id: e83a828209
 2013-11-14 13:29:30 -06:00
Bryan Kowal
ae5e6b3927 Issue #2540 - pure python module merge implementation 
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching

Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1

Former-commit-id: 48cc679bce [formerly 2029c34f24] [formerly 48cc679bce [formerly 2029c34f24] [formerly 7e35ea310f [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 4759e48c5c [formerly a2261b9ff3]
Former-commit-id: 79045d620b
 2013-11-14 11:57:11 -06:00
Steve Harris
8307fe3a9f Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 77ea1782c3 [formerly 473488f5b8] [formerly 77ea1782c3 [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: a75acc5499 [formerly ef852ac125]
Former-commit-id: 39e8f5ecc1
 2013-11-13 23:20:18 -06:00
Richard Peter
0581cc53e5 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development 
Former-commit-id: adc30e817e [formerly 2f3eee1439] [formerly adc30e817e [formerly 2f3eee1439] [formerly e88f5777a7 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: ed258e9421 [formerly 64afe42e74]
Former-commit-id: 58c8106da8
 2013-11-13 16:43:26 -06:00
Brian Clements
09101ca5ac Issue #2505 removed recco from deployment 
added update script to drop recco from db


Former-commit-id: 3551b731e0 [formerly 95f1621d3e] [formerly 3551b731e0 [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: d2f0b73626 [formerly 49c8bd5ee9]
Former-commit-id: d94f44d406
 2013-11-13 13:45:44 -06:00
Bryan Kowal
97c0dff26a Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 178d95e59d [formerly 86dd200844] [formerly 178d95e59d [formerly 86dd200844] [formerly 0544b66f4e [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: a2b1211c52 [formerly 01735ca0c4]
Former-commit-id: 1a905e8a3c
 2013-11-13 13:16:55 -06:00
Steve Harris
d2104614be 14.1.1-8 baseline 
Former-commit-id: 90bc008a50 [formerly aa6c977e7b] [formerly 90bc008a50 [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: b7ca6163e3 [formerly 0123596fd9]
Former-commit-id: 42ece4fb6a
 2013-11-13 12:32:17 -05:00
Benjamin Phillippe
7ae33612c5 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query 
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: c294d5d77a [formerly 5cd030f096] [formerly c294d5d77a [formerly 5cd030f096] [formerly 1c46226a11 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]
Former-commit-id: 1c46226a11
Former-commit-id: 1a19965daf [formerly fe7c6886c4]
Former-commit-id: 64a37e7672
 2013-11-13 10:52:07 -06:00
Brian Clements
eb9764b77b Issue #1314 fixed WFS output problem found when testing KeyLocker 
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: 0d80fa7dc1 [formerly dfd88151e6] [formerly 0d80fa7dc1 [formerly dfd88151e6] [formerly 37f4f41d2d [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: c3a0ea3400 [formerly ef2acc6562]
Former-commit-id: ac221125f4
 2013-11-13 10:04:13 -06:00
Brian Clements
1d41861c3c Issue #2546 added fix for TAFs that contain legacy valid times 
added unit test


Former-commit-id: b0a5192dfa [formerly 191ffc6e63] [formerly b0a5192dfa [formerly 191ffc6e63] [formerly df1542a66c [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]
Former-commit-id: df1542a66c
Former-commit-id: bca5149811 [formerly 0e5d3e9e69]
Former-commit-id: b511453153
 2013-11-13 08:07:29 -06:00
Nate Jensen
6b4284ec55 Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development 
Former-commit-id: f2f778c042 [formerly accfefae6d] [formerly f2f778c042 [formerly accfefae6d] [formerly f0b386b632 [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]
Former-commit-id: f0b386b632
Former-commit-id: ec073efd45 [formerly 80227c4750]
Former-commit-id: 633faf692b
 2013-11-12 16:55:31 -06:00
Dave Hladky
fa2238778d Issue #2542 Jetty upgraded 
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 5313c8b68d [formerly 643a150777] [formerly 5313c8b68d [formerly 643a150777] [formerly e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]
Former-commit-id: e3a259182c
Former-commit-id: f2f670bc00 [formerly 53866e481a]
Former-commit-id: 86363574b3
 2013-11-12 14:55:41 -06:00
Nate Jensen
73d6499cc0 Merge "Issue #2539 removed java 7 specific code from exception subclass" into development 
Former-commit-id: edb2b6d217 [formerly 5e02427d6e] [formerly edb2b6d217 [formerly 5e02427d6e] [formerly c60228c854 [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]
Former-commit-id: c60228c854
Former-commit-id: c6e10ebdef [formerly a1315f1072]
Former-commit-id: a53cf1a079
 2013-11-12 14:41:34 -06:00
Richard Peter
7855a8f000 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development 
Former-commit-id: c25ba19514 [formerly 9af1de07d4] [formerly c25ba19514 [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]
Former-commit-id: f12839a9e5
Former-commit-id: 502d67591b [formerly c8ff79a7f5]
Former-commit-id: 0cf51fce74
 2013-11-12 13:47:04 -06:00
Nate Jensen
db3a33864f Merge "Issue #2448 fix scheduling for start/stop of subscription." into development 
Former-commit-id: db61d36b4e [formerly 88af1ddfcb] [formerly db61d36b4e [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]
Former-commit-id: 64aa00bad6
Former-commit-id: 7a5f716d70 [formerly 39679b0608]
Former-commit-id: f618186c69
 2013-11-12 12:46:38 -06:00