Commit graph

209 commits

Author SHA1 Message Date
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
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
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
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
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
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
Steve Harris
d3be09bd74 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
James Korman
3b97258e6a Issue #798 - Code review changes
Former-commit-id: f7a864a2c0 [formerly 14e68406b4] [formerly f7a864a2c0 [formerly 14e68406b4] [formerly 39a32d7c91 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]]
Former-commit-id: 39a32d7c91
Former-commit-id: 540435baa6 [formerly 15af4ada93]
Former-commit-id: f50359ba1d
2012-07-31 14:34:27 -05:00
James Korman
c901590446 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 1166a7cbb1 [formerly 38a2e426d9] [formerly 1166a7cbb1 [formerly 38a2e426d9] [formerly 4cbbc59278 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 16643cb1bc [formerly 5df52e38f9]
Former-commit-id: 41a80adfb1
2012-07-31 13:38:23 -05:00
Richard Peter
69b15da61d Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 4f64038c78 [formerly 97a1d083cd] [formerly 4f64038c78 [formerly 97a1d083cd] [formerly 8631b64e75 [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]]
Former-commit-id: 8631b64e75
Former-commit-id: 96e3782774 [formerly c379c2f884]
Former-commit-id: 347398d655
2012-07-31 09:16:23 -05:00
Nate Jensen
e1321b8bc9 Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 6f90bfa61c [formerly a65e9608fd] [formerly 6f90bfa61c [formerly a65e9608fd] [formerly 4a2841b287 [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 7d478ac74c [formerly 8fa0eb70db]
Former-commit-id: 04a7e5a8c0
2012-07-31 08:57:54 -05:00
Ron Anderson
d4a29dace5 Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: e9f24e8660 [formerly 7c6686f2f4] [formerly e9f24e8660 [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]
Former-commit-id: b1650b6143
Former-commit-id: 4efd9149f7 [formerly 6a3e6f599f]
Former-commit-id: e328b61d87
2012-07-31 08:36:27 -05:00
Bryan Kowal
93967d22c2 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: 67035fa0b8 [formerly 327ffa9439] [formerly 67035fa0b8 [formerly 327ffa9439] [formerly cd40d9accf [formerly dca54e56436ace397c6163b03ac4edb480336404]]]
Former-commit-id: cd40d9accf
Former-commit-id: 6ac43a3c0c [formerly 107831f23d]
Former-commit-id: e0c0b5928f
2012-07-28 08:52:36 -05:00
Richard Peter
82db8b29eb Merge "Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development
Former-commit-id: 1de59b48cf [formerly 9e3cd2546a] [formerly 1de59b48cf [formerly 9e3cd2546a] [formerly 77c2ab2c05 [formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]]]
Former-commit-id: 77c2ab2c05
Former-commit-id: b6a1b5011f [formerly d131cd42cf]
Former-commit-id: c8ce12f7ac
2012-07-27 14:50:00 -05:00
Steve Harris
05082b1d3a Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 302aa05586 [formerly de9034c96c] [formerly 302aa05586 [formerly de9034c96c] [formerly 4688ac304f [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]
Former-commit-id: 4688ac304f
Former-commit-id: f2ab9cfe1a [formerly b82d6772c3]
Former-commit-id: acfc6eff55
2012-07-27 14:50:45 -05:00
Steve Harris
84d0f1fbb6 Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
2012-07-27 14:44:44 -05:00
Max Schenkelberg
9a1cd3b5e1 Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM.  Also changed MessageGenerator to use new class for finding the wmo header

Amend: Added try-finally for input stream in DataUnzipper

Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1

Former-commit-id: 7ace2035c5 [formerly 756988cb8b] [formerly 7ace2035c5 [formerly 756988cb8b] [formerly b669f57ee4 [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]]]
Former-commit-id: b669f57ee4
Former-commit-id: 864d6335a6 [formerly 51f9666fcb]
Former-commit-id: e45c7f58ac
2012-07-27 14:42:36 -05:00
Nate Jensen
c2558bdb79 Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: ac8d12ce13 [formerly 3d07fc8ebf] [formerly ac8d12ce13 [formerly 3d07fc8ebf] [formerly dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: 4e0a0f10dc [formerly 67edb6917d]
Former-commit-id: 70d269fc34
2012-07-26 17:43:29 -05:00
Ron Anderson
fceddcbedc Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 21431b2693 [formerly 1f2e581534] [formerly 21431b2693 [formerly 1f2e581534] [formerly b52f1400ef [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]]
Former-commit-id: b52f1400ef
Former-commit-id: e184dceb91 [formerly bc034e1863]
Former-commit-id: bc519a7ce2
2012-07-23 16:49:21 -05:00
Steve Harris
36e2ad3023 12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
2012-07-19 16:20:40 -05:00
Max Schenkelberg
41d82a3e53 Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: 0cfd8834c2 [formerly c8909c0fbc] [formerly 0cfd8834c2 [formerly c8909c0fbc] [formerly d8971a72fd [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]]
Former-commit-id: d8971a72fd
Former-commit-id: 5d8515fb58 [formerly bc0ec0455d]
Former-commit-id: c419654b74
2012-07-19 11:45:01 -05:00
Max Schenkelberg
eb5d50a7d2 Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now
Change-Id: I8f87118b3e283acc5c19dc97497730b9cabec0f1

Former-commit-id: 39e199147e [formerly a9360b7078] [formerly 39e199147e [formerly a9360b7078] [formerly dcdffe345d [formerly 91148d4bfe159c346baaf33a4fb5bac0c174bd37]]]
Former-commit-id: dcdffe345d
Former-commit-id: 04e75db5af [formerly cd9e7563de]
Former-commit-id: c90c274e57
2012-07-16 10:00:28 -05:00
Richard Peter
1291dc66c7 Merge "Issue #798 - Modified Satellite component to persist GOESR data" into development
Former-commit-id: a06dde8a30 [formerly 19203d87f3] [formerly a06dde8a30 [formerly 19203d87f3] [formerly ee6738152d [formerly d3144d913bda351fba681b6fe5e4dd5148cfc49c]]]
Former-commit-id: ee6738152d
Former-commit-id: 5a038a3d6d [formerly 3c1f3d3d0a]
Former-commit-id: 344386e039
2012-07-13 09:18:46 -05:00
Bryan Kowal
fee2a4e419 Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: b446253674 [formerly db6b535eb6] [formerly b446253674 [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 34a4f58074 [formerly 46198b0c92]
Former-commit-id: de1d59a174
2012-07-12 12:58:40 -05:00
Bryan Kowal
095a4ebfa2 Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
Former-commit-id: 7f6015eba5 [formerly 0f31fadffa] [formerly 7f6015eba5 [formerly 0f31fadffa] [formerly bde6be6e2b [formerly ea1b0920d908481e28477329497204dda324bd3e]]]
Former-commit-id: bde6be6e2b
Former-commit-id: 6d961d22fb [formerly 00c9a0f708]
Former-commit-id: 5b87488b52
2012-07-11 17:31:55 -05:00
Bryan Kowal
50d469075a Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 6fe6e64f38 [formerly 5058c32c34] [formerly 6fe6e64f38 [formerly 5058c32c34] [formerly 31f2db8719 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]]
Former-commit-id: 31f2db8719
Former-commit-id: 43f3d40a8e [formerly 5619099acd]
Former-commit-id: 8378fadbc2
2012-07-11 16:28:28 -05:00