Commit graph

231 commits

Author SHA1 Message Date
Dave Hladky
afb00feb6d Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: af27b562d7 [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]
Former-commit-id: c78fb26fbf
2012-09-11 09:39:43 -05:00
Dave Hladky
33f222783d Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 6818408d40 [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]
Former-commit-id: 28912552fe
2012-09-11 08:56:51 -05:00
David Gillingham
cff73c9e1d Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 83681d1ff6 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]
Former-commit-id: f192c8d115
2012-09-07 12:29:36 -05:00
Steve Harris
0e046d847a Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: bba4eb12d0
2012-09-04 12:11:03 -05:00
Steve Harris
0abf64b77c 12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: 195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
f52c8b374d Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]
Former-commit-id: 3a9d4961e2
2012-08-30 14:40:34 -05:00
Steve Harris
d07c18918d 12.9.1-11 baseline
Former-commit-id: fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]
Former-commit-id: 6eb6b0909b
2012-08-30 14:36:12 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
2012-08-30 14:28:27 -05:00
Steve Harris
51eb89eb2a 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: a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]
Former-commit-id: 91e39617cb
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
20c65a4677 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: f646b185da [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]
Former-commit-id: 1b45f1b6d9
2012-08-23 09:27:46 -05:00
Richard Peter
0dd2c44c9c Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 4c56f4e20d [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]
Former-commit-id: 6c1690e063
2012-08-22 17:07:17 -05:00
Steve Harris
7a4f4ac493 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]
Former-commit-id: b8ab6066f6
2012-08-22 16:00:33 -05:00
James Korman
6d250cf9f3 Issue #798 - Correct for hdfFileId
Former-commit-id: c2c228b429 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]
Former-commit-id: 56d6b1e886
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
04389b9f21 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: a5c57e8d24 [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]
Former-commit-id: a501aacb3b
2012-08-22 13:03:24 -05:00
Steve Harris
04c8c3ca55 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: b8629a0f20 [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]
Former-commit-id: 8e3ecc1efd
2012-08-22 13:01:08 -05:00
Steve Harris
084ac9fbd4 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: 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]
Former-commit-id: d38f8b80f0
2012-08-21 16:17:58 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Ron Anderson
16231374f8 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: 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]
Former-commit-id: d7a818fd1d
2012-08-17 12:41:49 -05:00
Ron Anderson
93c632c1ff Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]
Former-commit-id: 1321db6a99
2012-08-17 12:20:08 -05:00
root
ac8888ae10 Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 6eec24180e [formerly 2368421395496141fdc6467fd165babc282b65ac]
Former-commit-id: 342bda7e5f
2012-08-15 22:29:38 +00:00
root
d170ae704b 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: ba40e18fb2 [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]
Former-commit-id: b93989daaf
2012-08-15 22:29:07 +00:00
root
0987fc6b3d Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: cb46f57879
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
dd8ed9eca0 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: 7bad34f906 [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]
Former-commit-id: 72c63e1a6f
2012-08-15 16:22:39 -05:00
Steve Harris
36c108e960 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: dcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
c11f7d396e 12.9.1-3 baseline
Former-commit-id: 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 36d80b1f60
2012-08-15 14:26:10 -05:00
Steve Harris
27871051e3 12.9.1-2 baseline
Former-commit-id: a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: d1d877d319
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
f37a75f265 Issue #915 Set the user data.
Former-commit-id: 03ed8ee0b0 [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]
Former-commit-id: 865136f6ef
2012-08-15 14:05:50 -05:00
Steve Harris
8309193ce9 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 31ae7ea218
2012-08-15 13:59:00 -05:00
Ron Anderson
bac68cc1de Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 81abb2c60b [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]
Former-commit-id: 17f636c2a2
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
54b538bb07 Issue #947 revert changes to dataTime format
Former-commit-id: 70ba8d82db [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]
Former-commit-id: 50cb7383a6
2012-08-14 16:20:36 -05:00
Ron Anderson
5c80f582b3 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 985167892d [formerly 564b72997c59a665398c8687d6bafdb54c469881]
Former-commit-id: 71d74b1dcf
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
fd2bf26119 Issue #947 revert changes to dataTime format
Former-commit-id: 434193b34b [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]
Former-commit-id: ce689ad5fa
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
573cc270e8 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 1e527f83f0 [formerly 06c2c85159598ca803c663de97caed4b6841c135]
Former-commit-id: c6a121962f
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
8d118c392a Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: b53fe917bc [formerly 045952304218c867d8fe89df9828f70632df2d00]
Former-commit-id: 525c0b21a9
2012-08-09 17:50:23 -05:00
Nate Jensen
32cc46ec4e 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: 4211a8deac [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]
Former-commit-id: eeaa2c798f
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
64caa963b1 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]
Former-commit-id: 066a5af2a6
2012-08-09 17:16:38 -05:00
Nate Jensen
8cd83e1571 Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: fbbf74eb50 [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]
Former-commit-id: a88d7bcedc
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
cac790ac5a Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]
Former-commit-id: 97ba96759c
2012-08-08 14:41:33 -05:00
Steve Harris
fc39ef78e4 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: d538fd8913 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]
Former-commit-id: bbf4b18204
2012-08-08 13:57:46 -05:00
Steve Harris
e2267aa186 Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 9e2e0fa166 [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]
Former-commit-id: 926ff5dc5a
2012-08-07 15:29:25 -05:00
Steve Harris
6615c96f33 Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 3f88fa9078 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]
Former-commit-id: 6dae0398d3
2012-08-07 10:04:39 -05:00
Steve Harris
60c0cfc3b3 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: f3babcf1a1 [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]
Former-commit-id: d90c5f989d
2012-08-06 11:13:47 -05:00
Max Schenkelberg
ae3b62ca12 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: 0031d21292 [formerly b0466e68bea4102f397db214bb58b66c10a338ed]
Former-commit-id: 36bf80d13e
2012-08-06 09:44:44 -05:00
Steve Harris
9e2d161f8d Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]
Former-commit-id: f0b7d5e4c5
2012-08-06 09:38:26 -05:00
Steve Harris
6244359a80 12.8.1-10 baseline
Former-commit-id: ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]
Former-commit-id: b5e8fee24d
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
06ce1c6dd5 Issue #1006 Implemented urban areas.
Former-commit-id: 62db15b6f4 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]
Former-commit-id: dbd30e3b67
2012-08-06 08:41:52 -05:00
Steve Harris
54c505dd8e Merge branch 'development' into development_on_ss_builds
Former-commit-id: a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]
Former-commit-id: 24799cd93d
2012-08-06 08:23:04 -05:00
Bryan Kowal
dd1acbe70a Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: 5ca4a66fdc [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]
Former-commit-id: c6b2d65308
2012-08-02 10:33:55 -05:00
James Korman
fd1156d67d Issue #798 - Updates to satellite
Former-commit-id: 2ddb2f6df0 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]
Former-commit-id: 7928d912e1
2012-08-01 16:31:59 -05:00
Steve Harris
fb47934159 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: 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]
Former-commit-id: 6d77b94217
2012-08-01 12:43:12 -05:00