Commit graph

2656 commits

Author SHA1 Message Date
Steve Harris
84b893fd39 Merge branch 'ss_builds' into Unified_Grid
Former-commit-id: 2804af0e56 [formerly b53075f288] [formerly 206e25cbd4] [formerly a821755cf3 [formerly 206e25cbd4 [formerly 192e3b583fade6ba3d17be6a3f6248cb11a6a673]]]
Former-commit-id: a821755cf3
Former-commit-id: b1e78a77db7590ddbfaf64f2470ef11f5205e957 [formerly 3a923433e6]
Former-commit-id: 107ae12457
2012-09-13 15:26:38 -05:00
Steve Harris
92bac7167a Merge branch 'development' into Enhanced_points
Former-commit-id: b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901]
Former-commit-id: bc86013d8f
2012-09-13 15:25:12 -05:00
Steve Harris
65fc6b85b0 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 2a42503413 [formerly 9ae530cd1b] [formerly abc2a7fb62] [formerly da0afec2c1 [formerly abc2a7fb62 [formerly 165e2e8bfb9527ba1d5c274e351d63196eafa0e9]]]
Former-commit-id: da0afec2c1
Former-commit-id: ec0172ce05892299c83bf5ec5335a17b6abc84cd [formerly dcae36f2d7]
Former-commit-id: f4ed20ec4e
2012-09-13 15:21:40 -05:00
Max Schenkelberg
38c1f1bb52 Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well.
Change-Id: I4756cffb310ba9c7eab707b3764f667db01f886f

Former-commit-id: 587b5bacc0 [formerly 3cdabeb7cd] [formerly 5a9d7eea35] [formerly 932e4da3a9 [formerly 5a9d7eea35 [formerly ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67]]]
Former-commit-id: 932e4da3a9
Former-commit-id: 8053cdf94bff1afc4a5eb26c0e3e4653e80c2fb3 [formerly e6ca7b1122]
Former-commit-id: 78348fd355
2012-09-13 14:37:20 -05:00
Steve Harris
9d1f595fe6 Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]
Former-commit-id: e23b030dfd
2012-09-13 13:26:13 -05:00
Steve Harris
424c32bd5d 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
James Korman
a5bc971db4 Issue #1011 - Corrected AIREP turbulence decoding
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1

Former-commit-id: 972d96fe33 [formerly 6531df3ab0] [formerly c0e5570aa2] [formerly d3fd8a53df [formerly c0e5570aa2 [formerly 41dd04864bbd4b510b5e1b0c6e4259bb140b9b2e]]]
Former-commit-id: d3fd8a53df
Former-commit-id: a836538e0d3617f5215a978ca16aab21016c1d40 [formerly 029f9537c8]
Former-commit-id: 2241841dcd
2012-09-13 10:18:39 -05:00
Brad Gonzales
05314b8677 Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: b384c8372b [formerly 32df328434] [formerly 4b383c3274] [formerly d10cabc917 [formerly 4b383c3274 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]]
Former-commit-id: d10cabc917
Former-commit-id: 843e55a046283daa44610ca5e1825fc4341a5d8c [formerly 41dc92ba3a]
Former-commit-id: 2ea4005704
2012-09-13 07:50:56 -05:00
Steve Harris
0f90ce8b04 Merge branch 'development' into Enhanced_points
Former-commit-id: bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]
Former-commit-id: ada1066831
Former-commit-id: ad082c7958881e97fce6af73febade39a438deb1 [formerly d85659d9de]
Former-commit-id: e0ee6bbf96
2012-09-12 14:14:56 -05:00
Richard Peter
37f43c90d0 Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
Former-commit-id: 9bdafe3e90 [formerly 8c6a9c6719] [formerly 2c39f2e584] [formerly 54b7b9ed09 [formerly 2c39f2e584 [formerly a0ec82d660d95f6d8e0866d03ccc6fa97b361a71]]]
Former-commit-id: 54b7b9ed09
Former-commit-id: 60b521299003e2aa96a5541086e2d10336e2ad6e [formerly 7f93237af0]
Former-commit-id: 41eb2f3d9a
2012-09-12 11:45:08 -05:00
Max Schenkelberg
c8d7d72fcb Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb

Former-commit-id: 863ecb1ad6 [formerly e1b01588d1] [formerly eabc8d684b] [formerly cc37173be9 [formerly eabc8d684b [formerly 42b8711fa44c85aee40070683729727192b62891]]]
Former-commit-id: cc37173be9
Former-commit-id: 95fa4b0a40ddfb9e179dc5f25ed544f2ae347f2c [formerly ec9b3c56fb]
Former-commit-id: 69ba6f1ce1
2012-09-12 09:22:25 -05:00
Richard Peter
f1d458e450 Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 5baaa6593f [formerly c8443cf85c] [formerly 701960a246] [formerly 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]
Former-commit-id: 60b21393fc
Former-commit-id: 1caef7b52e6ad68e0ead7729ecc24930c9ffc1dc [formerly b5d3a41fb1]
Former-commit-id: 9d1413ff28
2012-09-12 08:27:11 -05:00
Steve Harris
1ce86f79cb Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: eff949899d [formerly d39a318583] [formerly d6e8f85db22a4436acfe2dbb5a4301161b57787d [formerly 503cddcc5e]] [formerly adf25aa707 [formerly 503cddcc5e [formerly 6d859accd185300997d14e7daf17f3c3257c348d]]]
Former-commit-id: adf25aa707
Former-commit-id: ce66c34bbdf3a8a1520465c247af5fbfd7bd9f07 [formerly 865fd2f475]
Former-commit-id: 31c1998d08
2012-09-11 17:06:26 -05:00
Steve Harris
047003d8c0 Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]
Former-commit-id: 012c526816
Former-commit-id: bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7]
Former-commit-id: b14d30591b
2012-09-11 16:57:03 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
406bde9fd0 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]
Former-commit-id: ec74f638e5
2012-09-11 15:50:57 -05:00
Max Schenkelberg
197e66e51f Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546

Former-commit-id: b5a198a27d [formerly ab120dfec6] [formerly fffe220e05] [formerly c4398c09a4 [formerly fffe220e05 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]]
Former-commit-id: c4398c09a4
Former-commit-id: e9cbdce4b29b44a0103e0ad9a4d1f9761738853d [formerly a513b5830a]
Former-commit-id: 7d5c82ebfd
2012-09-11 14:04:14 -05:00
Lee Venable
78a6ccd095 Merge "Issue #1161 changed comparator" into development
Former-commit-id: 1a5f514d00 [formerly f731ae885c] [formerly 802b43036e] [formerly a691386102 [formerly 802b43036e [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]]]
Former-commit-id: a691386102
Former-commit-id: 57d821bd7ff0430e0c64e94dcdfb94505b76dd25 [formerly 9f1f054f4c]
Former-commit-id: a5dde0e55d
2012-09-11 10:02:21 -05:00
Dave Hladky
ddd93c8f13 Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: 70ccfe678a [formerly afb00feb6d] [formerly c78fb26fbf] [formerly af27b562d7 [formerly c78fb26fbf [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]]]
Former-commit-id: af27b562d7
Former-commit-id: 0a71ddea9802f93622bdd8b3d213d5d6a1e152d1 [formerly 1c1ffc7793]
Former-commit-id: e30f36206f
2012-09-11 09:39:43 -05:00
Lee Venable
b921d8300c Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: c1d6d8e77a [formerly 1f86d2c4ba] [formerly 056e74d3cf] [formerly 83fc018f38 [formerly 056e74d3cf [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]]
Former-commit-id: 83fc018f38
Former-commit-id: fe0be8190662c7e6d90a9853e2d5697ccd2f90f4 [formerly 1d0bdbd25c]
Former-commit-id: 782593a118
2012-09-11 09:15:47 -05:00
Dave Hladky
566007c438 Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 7ea2655805 [formerly 33f222783d] [formerly 28912552fe] [formerly 6818408d40 [formerly 28912552fe [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]]
Former-commit-id: 6818408d40
Former-commit-id: 5f94e8ba51158c8fb39f7777f808e5c34c42b933 [formerly 655939bba7]
Former-commit-id: 02b00ddf47
2012-09-11 08:56:51 -05:00
Ben Steffensmeier
473fd64d85 Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a

Former-commit-id: 4841cf1373 [formerly 0bfedb4e54] [formerly b3ead4e169] [formerly a563707ad5 [formerly b3ead4e169 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]]
Former-commit-id: a563707ad5
Former-commit-id: 22157876b570a53c0bc10d5fe90ea6bee3582515 [formerly e3b5a5effc]
Former-commit-id: a039d55916
2012-09-10 14:24:32 -05:00
Max Schenkelberg
827ef7301b Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: f7abe9ee39 [formerly 6d78afd423] [formerly 80439b309b] [formerly 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: f9f8eef104b9eb8e02ca5321a8ca3396d4878105 [formerly 20f5d966db]
Former-commit-id: d2d74fac20
2012-09-10 10:45:37 -05:00
David Gillingham
75daa050de Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: fc39f37437 [formerly cff73c9e1d] [formerly f192c8d115] [formerly 83681d1ff6 [formerly f192c8d115 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]]
Former-commit-id: 83681d1ff6
Former-commit-id: 92c5f6a8e1768a660e1ac985fa2926880692a6db [formerly 9d13d3244d]
Former-commit-id: 64bf7f0613
2012-09-07 12:29:36 -05:00
Bryan Kowal
0b7709663c Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: f3a273027c [formerly 3c63f21cfc] [formerly ec89c440fe] [formerly 04b574f56e [formerly ec89c440fe [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]]
Former-commit-id: 04b574f56e
Former-commit-id: 64429dfda116bd48a4b498f09ed3888f7a1ee784 [formerly 84f7083b81]
Former-commit-id: 8a04029498
2012-09-07 10:28:51 -05:00
Steve Harris
20e088a957 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
ff1a0c911d Merge branch 'development' into Enhanced_points
Former-commit-id: feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]
Former-commit-id: 32cf7fd764
Former-commit-id: 9a3bf8cf46dc47950600c368d21537bbdc91f65e [formerly 592ab923bb]
Former-commit-id: 5a8e58eda5
2012-08-30 15:43:06 -05:00
Steve Harris
a3a1864f56 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]
Former-commit-id: ffe253196a
2012-08-30 14:40:34 -05:00
Steve Harris
503b7bf15c 12.9.1-11 baseline
Former-commit-id: a2bb1dabe0 [formerly d07c18918d] [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4]
Former-commit-id: dc5ec3d16d
2012-08-30 14:36:12 -05:00
Steve Harris
c704490769 12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Steve Harris
fd6e8d5b63 Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]
Former-commit-id: dbcb28ce77
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
137c2871ad Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java

Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8

Former-commit-id: caaa78a981 [formerly 20c65a4677] [formerly 1b45f1b6d9] [formerly f646b185da [formerly 1b45f1b6d9 [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]]
Former-commit-id: f646b185da
Former-commit-id: 1c449e3e548384fc5bac6858d0c0c2448e8c91fe [formerly a09fa0b649]
Former-commit-id: da1f3fe29b
2012-08-23 09:27:46 -05:00
Richard Peter
f8c069352b Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: f9878c21f7 [formerly 0dd2c44c9c] [formerly 6c1690e063] [formerly 4c56f4e20d [formerly 6c1690e063 [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]]
Former-commit-id: 4c56f4e20d
Former-commit-id: aa9cb1756d6fdff94be46dc7b16cb3fc2c90806e [formerly 252e8e7e2e]
Former-commit-id: 46cd0f5110
2012-08-22 17:07:17 -05:00
Steve Harris
fffd905412 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb]
Former-commit-id: 34fa4b5804
2012-08-22 16:00:33 -05:00
James Korman
ce2d764418 Issue #798 - Correct for hdfFileId
Former-commit-id: 7d61470ce7 [formerly 6d250cf9f3] [formerly 56d6b1e886] [formerly c2c228b429 [formerly 56d6b1e886 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]]
Former-commit-id: c2c228b429
Former-commit-id: a916e362db2cd43e97c1bd5342c3a7bf8e191bc2 [formerly 654ecefd3e]
Former-commit-id: ea24ef83b8
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a7872b1c6d Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: e69aa93735 [formerly 04389b9f21] [formerly a501aacb3b] [formerly a5c57e8d24 [formerly a501aacb3b [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]]
Former-commit-id: a5c57e8d24
Former-commit-id: 6425b9202293405230f8ab681a2ceb8043b34140 [formerly c7bc786a60]
Former-commit-id: 5d988cc5c1
2012-08-22 13:03:24 -05:00
Steve Harris
0e79416277 Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java


Former-commit-id: deb39fdbea [formerly 04c8c3ca55] [formerly 8e3ecc1efd] [formerly b8629a0f20 [formerly 8e3ecc1efd [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]]
Former-commit-id: b8629a0f20
Former-commit-id: 9c4d41d56393145d694a3b135f570872b089f630 [formerly 9565d18b96]
Former-commit-id: d974aaf277
2012-08-22 13:01:08 -05:00
Steve Harris
a6797a478a Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]
Former-commit-id: b335416e06
2012-08-21 16:17:58 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Ron Anderson
21b48541c3 Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1]
Former-commit-id: 6e3674f9fc
2012-08-17 12:41:49 -05:00
Ron Anderson
0a32c7c683 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705]
Former-commit-id: e5952c1c99
2012-08-17 12:20:08 -05:00
root
c7a8b1e7fd Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: e2b7a1679b [formerly ac8888ae10] [formerly 342bda7e5f] [formerly 6eec24180e [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]]
Former-commit-id: 6eec24180e
Former-commit-id: 688200e149897d55c1b90b9f2d6fb48f7cfa67a2 [formerly b3217ad886]
Former-commit-id: f0cb647101
2012-08-15 22:29:38 +00:00
root
c8d09a5973 Merge branch 'reconcile' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Former-commit-id: b6e17e9b02 [formerly d170ae704b] [formerly b93989daaf] [formerly ba40e18fb2 [formerly b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]
Former-commit-id: ba40e18fb2
Former-commit-id: b304e3656660b7049f012ff5306eb9b118135fb1 [formerly 3e9d1fa430]
Former-commit-id: fd69b031d2
2012-08-15 22:29:07 +00:00
root
791f3f5b85 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]
Former-commit-id: 537dbadf64
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
ebdadf4b89 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: ec41ec59ee [formerly dd8ed9eca0] [formerly 72c63e1a6f] [formerly 7bad34f906 [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]
Former-commit-id: 7bad34f906
Former-commit-id: c02cc2e93c8e648fd97f9f7d42aacefcb2dffcb0 [formerly 91493ee0b9]
Former-commit-id: 11bf8bb4c7
2012-08-15 16:22:39 -05:00
Steve Harris
80655bf0a3 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]
Former-commit-id: d7d60cc623
2012-08-15 15:19:10 -05:00
Steve Harris
988563a4b6 12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]
Former-commit-id: a535b51eba
2012-08-15 14:26:10 -05:00
Steve Harris
8690f264b6 12.9.1-2 baseline
Former-commit-id: ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2]
Former-commit-id: de4c812834
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
b0036d9ad7 Issue #915 Set the user data.
Former-commit-id: 55ac7d7684 [formerly f37a75f265] [formerly 865136f6ef] [formerly 03ed8ee0b0 [formerly 865136f6ef [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: aede2757d06a4b4752402af488f523f9e9e0e79e [formerly e584d728f0]
Former-commit-id: f1749f4fcc
2012-08-15 14:05:50 -05:00