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

3329 commits

Author SHA1 Message Date
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
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
 2012-08-15 22:15:20 +00:00
Benjamin Phillippe
bd2023ec70 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories 
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: dd8ed9eca0 [formerly 72c63e1a6f] [formerly dd8ed9eca0 [formerly 72c63e1a6f] [formerly 7bad34f906 [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]
Former-commit-id: 7bad34f906
Former-commit-id: 11bf8bb4c7 [formerly 91493ee0b9]
Former-commit-id: e23523ad80
 2012-08-15 16:22:39 -05:00
Steve Harris
7e1d1f6e08 12.9.1-4 baseline 
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
 2012-08-15 15:19:10 -05:00
Steve Harris
03bb51ed0e 12.9.1-3 baseline 
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a]
Former-commit-id: 8c5c5ad6eb
 2012-08-15 14:26:10 -05:00
Steve Harris
adf346e7d3 12.9.1-2 baseline 
Former-commit-id: 27871051e3 [formerly d1d877d319] [formerly 27871051e3 [formerly d1d877d319] [formerly a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: de4c812834 [formerly 448ed038c2]
Former-commit-id: ed416f241e
 2012-08-15 14:12:24 -05:00
Jonathan Sanchez
49c757f958 Issue #915 Set the user data. 
Former-commit-id: f37a75f265 [formerly 865136f6ef] [formerly f37a75f265 [formerly 865136f6ef] [formerly 03ed8ee0b0 [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: f1749f4fcc [formerly e584d728f0]
Former-commit-id: 38bb2743e5
 2012-08-15 14:05:50 -05:00
Steve Harris
16d7d955fc 12.9.1-1 baseline 
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
 2012-08-15 13:59:00 -05:00
Steve Harris
5fc58b8e12 Merge branch 'development' into Enhanced_points 
Former-commit-id: e372481f81 [formerly 346d775f57] [formerly e372481f81 [formerly 346d775f57] [formerly f7f97d9f54 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]
Former-commit-id: f7f97d9f54
Former-commit-id: 73e357c39d [formerly 031b655ab5]
Former-commit-id: 14923a89e9
 2012-08-15 13:35:47 -05:00
Ron Anderson
746e006e89 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate. 
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: bac68cc1de [formerly 17f636c2a2] [formerly bac68cc1de [formerly 17f636c2a2] [formerly 81abb2c60b [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]]
Former-commit-id: 81abb2c60b
Former-commit-id: c8b0719d48 [formerly 7cde30681b]
Former-commit-id: 3d0d4e9b09
 2012-08-14 16:27:11 -05:00
Ben Steffensmeier
4a9e7d5e3d Issue #947 revert changes to dataTime format 
Former-commit-id: 54b538bb07 [formerly 50cb7383a6] [formerly 54b538bb07 [formerly 50cb7383a6] [formerly 70ba8d82db [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]]
Former-commit-id: 70ba8d82db
Former-commit-id: 36455cfbed [formerly 77b7c4c517]
Former-commit-id: 242cc34efe
 2012-08-14 16:20:36 -05:00
Ron Anderson
d47eda2d66 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate. 
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 5c80f582b3 [formerly 71d74b1dcf] [formerly 5c80f582b3 [formerly 71d74b1dcf] [formerly 985167892d [formerly 564b72997c59a665398c8687d6bafdb54c469881]]]
Former-commit-id: 985167892d
Former-commit-id: c90619a3bc [formerly 9bf0166f13]
Former-commit-id: 13d7576686
 2012-08-14 16:20:23 -05:00
Ben Steffensmeier
7950a24c07 Issue #947 revert changes to dataTime format 
Former-commit-id: fd2bf26119 [formerly ce689ad5fa] [formerly fd2bf26119 [formerly ce689ad5fa] [formerly 434193b34b [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]]
Former-commit-id: 434193b34b
Former-commit-id: c14674c64f [formerly 15977fdba2]
Former-commit-id: f50c979293
 2012-08-14 16:12:02 -05:00
Ben Steffensmeier
32287c896b Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: 573cc270e8 [formerly c6a121962f] [formerly 573cc270e8 [formerly c6a121962f] [formerly 1e527f83f0 [formerly 06c2c85159598ca803c663de97caed4b6841c135]]]
Former-commit-id: 1e527f83f0
Former-commit-id: 0af9fd4fe2 [formerly c9ff69014b]
Former-commit-id: dc8d05c1be
 2012-08-09 17:53:19 -05:00
Ben Steffensmeier
62aafd3542 Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 8d118c392a [formerly 525c0b21a9] [formerly 8d118c392a [formerly 525c0b21a9] [formerly b53fe917bc [formerly 045952304218c867d8fe89df9828f70632df2d00]]]
Former-commit-id: b53fe917bc
Former-commit-id: 54b3078ad1 [formerly 4ed3d04e64]
Former-commit-id: fafea907c7
 2012-08-09 17:50:23 -05:00
Nate Jensen
5e82400554 Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds 
Former-commit-id: 32cc46ec4e [formerly eeaa2c798f] [formerly 32cc46ec4e [formerly eeaa2c798f] [formerly 4211a8deac [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]
Former-commit-id: 4211a8deac
Former-commit-id: c0fa1e8cf2 [formerly 2cc3c63ba7]
Former-commit-id: 0df3ab80eb
 2012-08-09 17:18:38 -05:00
Ben Steffensmeier
aa740ef6a8 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: 64caa963b1 [formerly 066a5af2a6] [formerly 64caa963b1 [formerly 066a5af2a6] [formerly ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]
Former-commit-id: ad1415948f
Former-commit-id: e03eb5f5c9 [formerly 65c33256d9]
Former-commit-id: 70f8f93f81
 2012-08-09 17:16:38 -05:00
Nate Jensen
b36d8c3f03 Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds 
Former-commit-id: 8cd83e1571 [formerly a88d7bcedc] [formerly 8cd83e1571 [formerly a88d7bcedc] [formerly fbbf74eb50 [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]]
Former-commit-id: fbbf74eb50
Former-commit-id: e2462c0cc3 [formerly 1214c05b72]
Former-commit-id: 135239eaee
 2012-08-08 16:10:13 -05:00
Ben Steffensmeier
873a7d64b6 Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: cac790ac5a [formerly 97ba96759c] [formerly cac790ac5a [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]
Former-commit-id: 5da238c8b9
Former-commit-id: 8cdf1f8d1c [formerly b6cc71bf75]
Former-commit-id: 726e934763
 2012-08-08 14:41:33 -05:00
Steve Harris
fe54bcc7e3 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: fc39ef78e4 [formerly bbf4b18204] [formerly fc39ef78e4 [formerly bbf4b18204] [formerly d538fd8913 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]]
Former-commit-id: d538fd8913
Former-commit-id: 352f391700 [formerly 0ef9f1c86e]
Former-commit-id: 9d5b631109
 2012-08-08 13:57:46 -05:00
Roger Ferrel
4e15803926 Issue #875 Markers and group added to Cave. 
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: b3c357c964 [formerly 2e3fc4b400] [formerly b3c357c964 [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: 69f22fe6bb [formerly ae41499ba2]
Former-commit-id: 4e356b8a13
 2012-08-08 13:35:47 -05:00
Steve Harris
05ef298baf Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: e2267aa186 [formerly 926ff5dc5a] [formerly e2267aa186 [formerly 926ff5dc5a] [formerly 9e2e0fa166 [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]]
Former-commit-id: 9e2e0fa166
Former-commit-id: d42beafc73 [formerly 15753699bd]
Former-commit-id: 3eefb26e94
 2012-08-07 15:29:25 -05:00
Steve Harris
87b964449a Fixed merge of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: 6615c96f33 [formerly 6dae0398d3] [formerly 6615c96f33 [formerly 6dae0398d3] [formerly 3f88fa9078 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]]
Former-commit-id: 3f88fa9078
Former-commit-id: a810a273a2 [formerly 9387e8b2d0]
Former-commit-id: 57d749c037
 2012-08-07 10:04:39 -05:00
Steve Harris
3f8544203f Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 60c0cfc3b3 [formerly d90c5f989d] [formerly 60c0cfc3b3 [formerly d90c5f989d] [formerly f3babcf1a1 [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]]
Former-commit-id: f3babcf1a1
Former-commit-id: 2f3ef9f4da [formerly 62e9207ba7]
Former-commit-id: 0428530b73
 2012-08-06 11:13:47 -05:00
Max Schenkelberg
335d2a0942 Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment 
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: ae3b62ca12 [formerly 36bf80d13e] [formerly ae3b62ca12 [formerly 36bf80d13e] [formerly 0031d21292 [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]]
Former-commit-id: 0031d21292
Former-commit-id: 1aa6d193b4 [formerly 482dfb4711]
Former-commit-id: 92df0af108
 2012-08-06 09:44:44 -05:00
Steve Harris
9fd142b98e Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds 
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 52e0da2293 [formerly b2432e096f]
Former-commit-id: dcc56b8a23
 2012-08-06 09:38:26 -05:00
Steve Harris
78d66ba6df 12.8.1-10 baseline 
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
 2012-08-06 09:34:26 -05:00
Jonathan Sanchez
9737533feb Issue #1006 Implemented urban areas. 
Former-commit-id: 06ce1c6dd5 [formerly dbd30e3b67] [formerly 06ce1c6dd5 [formerly dbd30e3b67] [formerly 62db15b6f4 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]]
Former-commit-id: 62db15b6f4
Former-commit-id: 1af2520b91 [formerly f26cce33a9]
Former-commit-id: 549b50ea40
 2012-08-06 08:41:52 -05:00
Steve Harris
b62ac9c78e Merge branch 'development' into development_on_ss_builds 
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: dbe07ca70c [formerly 8f4ddad22c]
Former-commit-id: d507458b9b
 2012-08-06 08:23:04 -05:00
Bryan Kowal
25ff80983e Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties. 
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: dd1acbe70a [formerly c6b2d65308] [formerly dd1acbe70a [formerly c6b2d65308] [formerly 5ca4a66fdc [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: 14c20083b0 [formerly f295ee11ea]
Former-commit-id: f064d0cf6c
 2012-08-02 10:33:55 -05:00
James Korman
7dc687b0f4 Issue #798 - Updates to satellite 
Former-commit-id: fd1156d67d [formerly 7928d912e1] [formerly fd1156d67d [formerly 7928d912e1] [formerly 2ddb2f6df0 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]]
Former-commit-id: 2ddb2f6df0
Former-commit-id: 4226007a10 [formerly 241303f9a0]
Former-commit-id: af41598a7b
 2012-08-01 16:31:59 -05:00
Steve Harris
078b4fff3c Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: fb47934159 [formerly 6d77b94217] [formerly fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b]
Former-commit-id: e892eb4628
 2012-08-01 12:43:12 -05:00
Max Schenkelberg
ae13ee6fa9 Issue #626 Fixed changes to GridDownscaler in SatelliteDao 
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: c3daf20fdf [formerly 2d36eb040d] [formerly c3daf20fdf [formerly 2d36eb040d] [formerly d89b58f7fd [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]]
Former-commit-id: d89b58f7fd
Former-commit-id: 81ce682e0b [formerly 9f34d7a5f3]
Former-commit-id: 7d99688c6a
 2012-08-01 11:36:44 -05:00
Max Schenkelberg
da993aeada Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet. 
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: 079a11565a [formerly f635e9c332] [formerly 079a11565a [formerly f635e9c332] [formerly cc0a1fbca3 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 7ee188d90a [formerly 74f0179b92]
Former-commit-id: 40e6cd390e
 2012-08-01 10:51:32 -05:00