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

2762 commits

Author SHA1 Message Date
Steve Harris
ff96578fb4 Merge branch 'development' into Enhanced_points and Enhanced_points into development 
Former-commit-id: c64e9b0ad9 [formerly 72ecefa9ee] [formerly c64e9b0ad9 [formerly 72ecefa9ee] [formerly fe92909f53 [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]]
Former-commit-id: fe92909f53
Former-commit-id: 91f26b6c0e [formerly b8d2ff47ca]
Former-commit-id: f9166b9d83
 2012-09-17 14:58:23 -05:00
Max Schenkelberg
8f757cf5ae Issue #626 update WMOHeaderRemover to remove any extra bytes before wmo header found from WMOHeaderFinder. 
Change-Id: I836fbc496c2dd2da610dbdd16b6bea0428a7966a

Former-commit-id: 38da9ec0c1 [formerly c4a3ff3076] [formerly 38da9ec0c1 [formerly c4a3ff3076] [formerly b0addbc1db [formerly 5f580a3989a9f08c20e829ae60318dcf2964ee6d]]]
Former-commit-id: b0addbc1db
Former-commit-id: 089fcc0310 [formerly 4e3ef3661e]
Former-commit-id: 132cad2d05
 2012-09-17 12:59:10 -05:00
Roger Ferrel
85cf1738ef Issue #875 Added tri-state for Point fields movable and hidden. 
Change-Id: Idcb54906735a6f727f4db88ca39ae0e57deb2964

Former-commit-id: 4978b5305d [formerly 70217e1556] [formerly 4978b5305d [formerly 70217e1556] [formerly 66d98d068c [formerly 15833c5ca3b8415b3a2fef1da98c42e95721331d]]]
Former-commit-id: 66d98d068c
Former-commit-id: 8d21873f2f [formerly 7bbcb004be]
Former-commit-id: ed3663b145
 2012-09-17 09:02:26 -05:00
Ron Anderson
14dd12d24a Merge "Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo XML files, modify ParameterInfo to provide list of valid levels for each parameter, create utility script to convert A1 CDL to A2 XML format, modify WeatherElementBrowser so database lists are always current." into development 
Former-commit-id: b628c604ad [formerly 5c844b346c] [formerly b628c604ad [formerly 5c844b346c] [formerly 2dc48d6a85 [formerly 5cc4ec7f99bb7e8d3185b4c5aa2b40f86125b618]]]
Former-commit-id: 2dc48d6a85
Former-commit-id: af643434d2 [formerly 558cfd51cb]
Former-commit-id: 6dbf6c9c81
 2012-09-13 17:41:14 -05:00
Nate Jensen
4a0294bd3d Merge "Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well." into development 
Former-commit-id: 661ef69489 [formerly 5e9ef6a224] [formerly 661ef69489 [formerly 5e9ef6a224] [formerly 1af2344565 [formerly 00c4c7a84f65c5c8bb45d3d3020d97c5b9d16eba]]]
Former-commit-id: 1af2344565
Former-commit-id: 7c5c958074 [formerly 99a6312ae0]
Former-commit-id: c1d12f5b54
 2012-09-13 16:26:02 -05:00
David Gillingham
dcc5c7789d Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo 
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.

Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5

Former-commit-id: 03a202134a [formerly 21739d1d38] [formerly 03a202134a [formerly 21739d1d38] [formerly 99ab0a124b [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]
Former-commit-id: 99ab0a124b
Former-commit-id: 28ade875c5 [formerly 964927b19d]
Former-commit-id: 527a457e55
 2012-09-13 15:39:58 -05:00
Steve Harris
674c12c0c4 Merge branch 'ss_builds' into Unified_Grid 
Former-commit-id: b53075f288 [formerly 206e25cbd4] [formerly b53075f288 [formerly 206e25cbd4] [formerly a821755cf3 [formerly 192e3b583fade6ba3d17be6a3f6248cb11a6a673]]]
Former-commit-id: a821755cf3
Former-commit-id: 107ae12457 [formerly 3a923433e6]
Former-commit-id: cbae0bdbba
 2012-09-13 15:26:38 -05:00
Steve Harris
40ddaa276f Merge branch 'development' into Enhanced_points 
Former-commit-id: 2e47ad78bc [formerly 321e2191b1] [formerly 2e47ad78bc [formerly 321e2191b1] [formerly 6146f56ce4 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]
Former-commit-id: 6146f56ce4
Former-commit-id: bc86013d8f [formerly 9ca736f901]
Former-commit-id: 69b6272658
 2012-09-13 15:25:12 -05:00
Steve Harris
42f2977019 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: 9ae530cd1b [formerly abc2a7fb62] [formerly 9ae530cd1b [formerly abc2a7fb62] [formerly da0afec2c1 [formerly 165e2e8bfb9527ba1d5c274e351d63196eafa0e9]]]
Former-commit-id: da0afec2c1
Former-commit-id: f4ed20ec4e [formerly dcae36f2d7]
Former-commit-id: e860b1ea6d
 2012-09-13 15:21:40 -05:00
Max Schenkelberg
2caf54f9d3 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: 3cdabeb7cd [formerly 5a9d7eea35] [formerly 3cdabeb7cd [formerly 5a9d7eea35] [formerly 932e4da3a9 [formerly ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67]]]
Former-commit-id: 932e4da3a9
Former-commit-id: 78348fd355 [formerly e6ca7b1122]
Former-commit-id: 3962f6b156
 2012-09-13 14:37:20 -05:00
Steve Harris
30b0700044 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: 04de1d5857 [formerly 29e7427dc3] [formerly 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]
Former-commit-id: 04d9735c8f
Former-commit-id: e23b030dfd [formerly 53673f63e6]
Former-commit-id: f80fb62837
 2012-09-13 13:26:13 -05:00
Steve Harris
e57e7237a9 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
 2012-09-13 12:08:11 -05:00
James Korman
be6c142d24 Issue #1011 - Corrected AIREP turbulence decoding 
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1

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

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

Former-commit-id: e1b01588d1 [formerly eabc8d684b] [formerly e1b01588d1 [formerly eabc8d684b] [formerly cc37173be9 [formerly 42b8711fa44c85aee40070683729727192b62891]]]
Former-commit-id: cc37173be9
Former-commit-id: 69ba6f1ce1 [formerly ec9b3c56fb]
Former-commit-id: 411a8d43a0
 2012-09-12 09:22:25 -05:00
Richard Peter
457cb5375e Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development 
Former-commit-id: c8443cf85c [formerly 701960a246] [formerly c8443cf85c [formerly 701960a246] [formerly 60b21393fc [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]
Former-commit-id: 60b21393fc
Former-commit-id: 9d1413ff28 [formerly b5d3a41fb1]
Former-commit-id: c142137798
 2012-09-12 08:27:11 -05:00
Steve Harris
2d3fdd9558 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: d39a318583 [formerly 503cddcc5e] [formerly d39a318583 [formerly 503cddcc5e] [formerly adf25aa707 [formerly 6d859accd185300997d14e7daf17f3c3257c348d]]]
Former-commit-id: adf25aa707
Former-commit-id: 31c1998d08 [formerly 865fd2f475]
Former-commit-id: dbd228eea2
 2012-09-11 17:06:26 -05:00
Steve Harris
3bec22460f 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: f94db138cd [formerly 64d4e2bded] [formerly f94db138cd [formerly 64d4e2bded] [formerly 012c526816 [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]
Former-commit-id: 012c526816
Former-commit-id: b14d30591b [formerly 41c82361f7]
Former-commit-id: bba73380ca
 2012-09-11 16:57:03 -05:00
Steve Harris
5030894212 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
 2012-09-11 16:00:38 -05:00
Steve Harris
5684a84a46 12.10.1-2 baseline 
Former-commit-id: dde1f4c54d [formerly 250f0ccac9] [formerly dde1f4c54d [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: ec74f638e5 [formerly 34d2ddee9d]
Former-commit-id: cc3c3dadee
 2012-09-11 15:50:57 -05:00
Max Schenkelberg
3a0d62686a 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: ab120dfec6 [formerly fffe220e05] [formerly ab120dfec6 [formerly fffe220e05] [formerly c4398c09a4 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]]
Former-commit-id: c4398c09a4
Former-commit-id: 7d5c82ebfd [formerly a513b5830a]
Former-commit-id: 6c5d3637e1
 2012-09-11 14:04:14 -05:00
Lee Venable
9ab6370e0d Merge "Issue #1161 changed comparator" into development 
Former-commit-id: f731ae885c [formerly 802b43036e] [formerly f731ae885c [formerly 802b43036e] [formerly a691386102 [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]]]
Former-commit-id: a691386102
Former-commit-id: a5dde0e55d [formerly 9f1f054f4c]
Former-commit-id: aa256d89e5
 2012-09-11 10:02:21 -05:00
Dave Hladky
47c4004123 Issue #1161 changed comparator 
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: afb00feb6d [formerly c78fb26fbf] [formerly afb00feb6d [formerly c78fb26fbf] [formerly af27b562d7 [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]]]
Former-commit-id: af27b562d7
Former-commit-id: e30f36206f [formerly 1c1ffc7793]
Former-commit-id: 6c4495a7e6
 2012-09-11 09:39:43 -05:00
Lee Venable
4d0edf403e Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development 
Former-commit-id: 1f86d2c4ba [formerly 056e74d3cf] [formerly 1f86d2c4ba [formerly 056e74d3cf] [formerly 83fc018f38 [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]]
Former-commit-id: 83fc018f38
Former-commit-id: 782593a118 [formerly 1d0bdbd25c]
Former-commit-id: 83c441319e
 2012-09-11 09:15:47 -05:00
Dave Hladky
2114682424 Issue #1161 Fixed anomaly with RFCFFG and graph QPE times 
Change-Id: I23212f3281290d86621e72c88478b00d37336494

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

Former-commit-id: 0bfedb4e54 [formerly b3ead4e169] [formerly 0bfedb4e54 [formerly b3ead4e169] [formerly a563707ad5 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]]
Former-commit-id: a563707ad5
Former-commit-id: a039d55916 [formerly e3b5a5effc]
Former-commit-id: 0b29bd7562
 2012-09-10 14:24:32 -05:00
Max Schenkelberg
29ab00a4cb 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: 6d78afd423 [formerly 80439b309b] [formerly 6d78afd423 [formerly 80439b309b] [formerly 84658dd03a [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: d2d74fac20 [formerly 20f5d966db]
Former-commit-id: 264bc403d6
 2012-09-10 10:45:37 -05:00
David Gillingham
0497ffc0d8 Issue #1150: Fix regression caused by previous text product generation changes by ensuring all 
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: cff73c9e1d [formerly f192c8d115] [formerly cff73c9e1d [formerly f192c8d115] [formerly 83681d1ff6 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]]
Former-commit-id: 83681d1ff6
Former-commit-id: 64bf7f0613 [formerly 9d13d3244d]
Former-commit-id: 7bb5d95ac5
 2012-09-07 12:29:36 -05:00
Bryan Kowal
c497827083 Issue #1134 - edex will now use the same jep library that CAVE does 
Former-commit-id: 3c63f21cfc [formerly ec89c440fe] [formerly 3c63f21cfc [formerly ec89c440fe] [formerly 04b574f56e [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]]
Former-commit-id: 04b574f56e
Former-commit-id: 8a04029498 [formerly 84f7083b81]
Former-commit-id: 6f159f35de
 2012-09-07 10:28:51 -05:00
Steve Harris
f8e7459dfb Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4]
Former-commit-id: e9582cb789
 2012-09-04 12:11:03 -05:00
Steve Harris
a924a8347a 12.10.1-1 baseline 
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
 2012-09-04 12:07:27 -05:00
Steve Harris
7c1cebf5b1 Merge branch 'development' into Enhanced_points 
Former-commit-id: fa7c31206b [formerly 5feac55dbd] [formerly fa7c31206b [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]
Former-commit-id: 32cf7fd764
Former-commit-id: 5a8e58eda5 [formerly 592ab923bb]
Former-commit-id: 66ac1051bc
 2012-08-30 15:43:06 -05:00
Steve Harris
b63855f152 Merge branch 'ss_builds' (12.9.1-11) into development 
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: f52c8b374d [formerly 3a9d4961e2] [formerly f52c8b374d [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: ffe253196a [formerly 3230e0b246]
Former-commit-id: 5b4ee818b7
 2012-08-30 14:40:34 -05:00
Steve Harris
982804ee0e 12.9.1-11 baseline 
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: dc5ec3d16d [formerly a14374fcd4]
Former-commit-id: f401755cde
 2012-08-30 14:36:12 -05:00
Steve Harris
ede38c4b3f 12.9.1-10 baseline 
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f [formerly dc08c5a71a]
Former-commit-id: 5bb474d33c
 2012-08-30 14:28:27 -05:00
Steve Harris
3f44e46a6f 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: 51eb89eb2a [formerly 91e39617cb] [formerly 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee]
Former-commit-id: 0b647c0c9d
 2012-08-27 09:53:55 -05:00
Jonathan Sanchez
e1a3c762b7 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: 20c65a4677 [formerly 1b45f1b6d9] [formerly 20c65a4677 [formerly 1b45f1b6d9] [formerly f646b185da [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]]
Former-commit-id: f646b185da
Former-commit-id: da1f3fe29b [formerly a09fa0b649]
Former-commit-id: acf62bb8d9
 2012-08-23 09:27:46 -05:00
Richard Peter
50ea44a1d3 Merge "Issue #798 - Correct for hdfFileId" into development 
Former-commit-id: 0dd2c44c9c [formerly 6c1690e063] [formerly 0dd2c44c9c [formerly 6c1690e063] [formerly 4c56f4e20d [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]]
Former-commit-id: 4c56f4e20d
Former-commit-id: 46cd0f5110 [formerly 252e8e7e2e]
Former-commit-id: 4a1c27bd22
 2012-08-22 17:07:17 -05:00
Steve Harris
d404638d82 12.9.1-5 baseline (with forgotten bin files now included) 
Former-commit-id: 7a4f4ac493 [formerly b8ab6066f6] [formerly 7a4f4ac493 [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 34fa4b5804 [formerly b2c0dd1abb]
Former-commit-id: 8f1120f6d8
 2012-08-22 16:00:33 -05:00
James Korman
dc185b6601 Issue #798 - Correct for hdfFileId 
Former-commit-id: 6d250cf9f3 [formerly 56d6b1e886] [formerly 6d250cf9f3 [formerly 56d6b1e886] [formerly c2c228b429 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]]
Former-commit-id: c2c228b429
Former-commit-id: ea24ef83b8 [formerly 654ecefd3e]
Former-commit-id: 36e4ea8147
 2012-08-22 13:24:28 -05:00
Benjamin Phillippe
1c9dca6062 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories 
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: 04389b9f21 [formerly a501aacb3b] [formerly 04389b9f21 [formerly a501aacb3b] [formerly a5c57e8d24 [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]]
Former-commit-id: a5c57e8d24
Former-commit-id: 5d988cc5c1 [formerly c7bc786a60]
Former-commit-id: d8680dc631
 2012-08-22 13:03:24 -05:00
Steve Harris
c9652b48f1 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: 04c8c3ca55 [formerly 8e3ecc1efd] [formerly 04c8c3ca55 [formerly 8e3ecc1efd] [formerly b8629a0f20 [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]]
Former-commit-id: b8629a0f20
Former-commit-id: d974aaf277 [formerly 9565d18b96]
Former-commit-id: bbe382231f
 2012-08-22 13:01:08 -05:00
Steve Harris
85533bdd24 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: 084ac9fbd4 [formerly d38f8b80f0] [formerly 084ac9fbd4 [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: b335416e06 [formerly 77369f78a6]
Former-commit-id: 445d1a6a0d
 2012-08-21 16:17:58 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
 2012-08-21 15:27:03 -05:00
Ron Anderson
f69d7b9c64 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: 16231374f8 [formerly d7a818fd1d] [formerly 16231374f8 [formerly d7a818fd1d] [formerly 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: 6e3674f9fc [formerly d3693827a1]
Former-commit-id: 1b655b0826
 2012-08-17 12:41:49 -05:00
Ron Anderson
b78c280ac8 Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: 93c632c1ff [formerly 1321db6a99] [formerly 93c632c1ff [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: e5952c1c99 [formerly 6eafdda705]
Former-commit-id: f7b9190b51
 2012-08-17 12:20:08 -05:00
root
a689deb547 Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds 
Former-commit-id: ac8888ae10 [formerly 342bda7e5f] [formerly ac8888ae10 [formerly 342bda7e5f] [formerly 6eec24180e [formerly 2368421395496141fdc6467fd165babc282b65ac]]]
Former-commit-id: 6eec24180e
Former-commit-id: f0cb647101 [formerly b3217ad886]
Former-commit-id: d1f2ac6698
 2012-08-15 22:29:38 +00:00
root
84a8231c49 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: d170ae704b [formerly b93989daaf] [formerly d170ae704b [formerly b93989daaf] [formerly ba40e18fb2 [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]
Former-commit-id: ba40e18fb2
Former-commit-id: fd69b031d2 [formerly 3e9d1fa430]
Former-commit-id: 64c3ccb4a4
 2012-08-15 22:29:07 +00:00