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: a71dac6cad91e39617cb
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: f646b185da1b45f1b6d9
2012-08-23 09:27:46 -05:00
Richard Peter
0dd2c44c9c
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 4c56f4e20d6c1690e063
2012-08-22 17:07:17 -05:00
James Korman
6d250cf9f3
Issue #798 - Correct for hdfFileId
...
Former-commit-id: c2c228b42956d6b1e886
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: a5c57e8d24a501aacb3b
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: b8629a0f208e3ecc1efd
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: 44a7cb75e7d38f8b80f0
2012-08-21 16:17:58 -05:00
Steve Harris
a1d931fd44
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c
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: 7662d249abd7a818fd1d
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: 819b9c8e561321db6a99
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: 6eec24180e342bda7e5f
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: ba40e18fb2b93989daaf
2012-08-15 22:29:07 +00:00
root
0987fc6b3d
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984cb46f57879
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: 7bad34f90672c63e1a6f
2012-08-15 16:22:39 -05:00
Steve Harris
36c108e960
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96ddcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
c11f7d396e
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e36d80b1f60
2012-08-15 14:26:10 -05:00
Steve Harris
27871051e3
12.9.1-2 baseline
...
Former-commit-id: a198b3a807d1d877d319
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
f37a75f265
Issue #915 Set the user data.
...
Former-commit-id: 03ed8ee0b0865136f6ef
2012-08-15 14:05:50 -05:00
Steve Harris
8309193ce9
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd9731ae7ea218
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: 81abb2c60b17f636c2a2
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
54b538bb07
Issue #947 revert changes to dataTime format
...
Former-commit-id: 70ba8d82db50cb7383a6
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: 985167892d71d74b1dcf
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
fd2bf26119
Issue #947 revert changes to dataTime format
...
Former-commit-id: 434193b34bce689ad5fa
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: 1e527f83f0c6a121962f
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
8d118c392a
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: b53fe917bc525c0b21a9
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: 4211a8deaceeaa2c798f
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: ad1415948f066a5af2a6
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: fbbf74eb50a88d7bcedc
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
cac790ac5a
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 5da238c8b997ba96759c
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: d538fd8913bbf4b18204
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: 9e2e0fa166926ff5dc5a
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: 3f88fa90786dae0398d3
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: f3babcf1a1d90c5f989d
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: 0031d2129236bf80d13e
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: 85f82b18b3f0b7d5e4c5
2012-08-06 09:38:26 -05:00
Steve Harris
6244359a80
12.8.1-10 baseline
...
Former-commit-id: ca25d508ecb5e8fee24d
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
06ce1c6dd5
Issue #1006 Implemented urban areas.
...
Former-commit-id: 62db15b6f4dbd30e3b67
2012-08-06 08:41:52 -05:00
Steve Harris
54c505dd8e
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: a1071e320424799cd93d
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: 5ca4a66fdcc6b2d65308
2012-08-02 10:33:55 -05:00
James Korman
fd1156d67d
Issue #798 - Updates to satellite
...
Former-commit-id: 2ddb2f6df07928d912e1
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: 51e38ca8876d77b94217
2012-08-01 12:43:12 -05:00
Max Schenkelberg
c3daf20fdf
Issue #626 Fixed changes to GridDownscaler in SatelliteDao
...
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90
Former-commit-id: d89b58f7fd2d36eb040d
2012-08-01 11:36:44 -05:00
Max Schenkelberg
079a11565a
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: cc0a1fbca3f635e9c332
2012-08-01 10:51:32 -05:00
Steve Harris
2653ddc2e3
12.8.1-5 baseline
...
Former-commit-id: cd49ef3edafd2abfb6f1
2012-08-01 10:45:37 -05:00
James Korman
f7a864a2c0
Issue #798 - Code review changes
...
Former-commit-id: 39a32d7c9114e68406b4
2012-07-31 14:34:27 -05:00
James Korman
1166a7cbb1
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 4cbbc5927838a2e426d9
2012-07-31 13:38:23 -05:00
Richard Peter
4f64038c78
Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
...
Former-commit-id: 8631b64e7597a1d083cd
2012-07-31 09:16:23 -05:00
Nate Jensen
6f90bfa61c
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 4a2841b287a65e9608fd
2012-07-31 08:57:54 -05:00
Ron Anderson
e9f24e8660
Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
...
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62
Former-commit-id: b1650b61437c6686f2f4
2012-07-31 08:36:27 -05:00
Bryan Kowal
67035fa0b8
Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
...
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6
Former-commit-id: cd40d9accf327ffa9439
2012-07-28 08:52:36 -05:00
