Commit graph

504 commits

Author SHA1 Message Date
Steve Harris
16ba74496d Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: 27dff26c47d68e83682e4ac3c61898378838bc5b
2013-05-16 13:45:58 -05:00
Bryan Kowal
11c93f548e Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: f90a3d048154641a2900fbe21de3e96db9f87aff
2013-05-16 10:21:11 -05:00
Bryan Kowal
b0122e794e Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: 25a995ec49f223eba1c81ce6d9da350c3f381607
2013-05-16 10:19:31 -05:00
Steve Harris
bcf7f15c90 13.4.1-9 baseline
Former-commit-id: 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375
2013-05-16 11:12:07 -04:00
Nate Jensen
35830d317d Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 444b61ff0af4a687bdf7daab51a3b435f91f3829
2013-05-15 14:00:15 -05:00
Nate Jensen
948e47a2c6 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: 147787a0a161bd54926e9ec86aee472b414859ed
2013-05-15 13:36:09 -05:00
Bryan Kowal
f9e77e90b7 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92
2013-05-15 11:55:56 -05:00
Steve Harris
19866e7032 13.4.1-8 baseline
Former-commit-id: d130c847d4f9d0b491f9326c8b5140fb59174927
2013-05-14 09:21:41 -04:00
Richard Peter
99391cfe12 Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: 883a51484d03900852ed84820aa559e088c97335
2013-05-13 17:16:57 -05:00
Richard Peter
8062c38b71 Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc
2013-05-13 16:33:50 -05:00
Steve Harris
4c6ff79e71 13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
e5fc3f3835 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937
2013-05-13 11:42:54 -05:00
Mike Duff
f887a41875 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: f5ab8a230b2c63bd025d32a2364a52b3536536d4
2013-05-10 09:58:02 -05:00
David Gillingham
51063c7c53 Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: 4c7f1216d9e2ba683bc46adcfe1d5863e4477490
2013-05-09 14:28:17 -05:00
Brad Gonzales
90d93e2a02 Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: a84978566dda2f943dff31f61c30ee286d961fd1
2013-05-09 08:05:49 -05:00
Richard Peter
4f3e86574b Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4
2013-05-08 17:28:01 -05:00
Ron Anderson
8a297d8e53 Merge changes Id2d7981b,I094b88ed into omaha_13.4.1
* changes:
  Issue #1939: Update AlertVizApplication to start NotificationManagerJob
  Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories


Former-commit-id: 1e94530814e28cc2a34cc92eab7164da3c3383e6
2013-05-08 15:08:40 -05:00
Richard Peter
f1f8260893 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 9f4d4de342b45ea54e328eec47fc606f1b087473
2013-05-08 14:55:43 -05:00
Bryan Kowal
bc39afbd24 Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9
2013-05-08 14:53:29 -05:00
Richard Peter
ff60ca76f7 Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: 0168cccd15ddb07988d946e3f4d719035dc63fb5
2013-05-08 13:49:29 -05:00
Nate Jensen
48d0829957 Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: ed7005a317c7d5bca71370544d6f2f79e10e9dee
2013-05-08 13:09:59 -05:00
Nate Jensen
bc1d029bd4 Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: 2b9f07f2b7eaf500d554424daa0e2740384164f1
2013-05-08 13:09:17 -05:00
Nate Jensen
cdf07833b9 Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
Former-commit-id: 7bf591249ed0495be49813e77c6c5111c0c9b0b4
2013-05-08 13:03:50 -05:00
Nate Jensen
653f4b2a0d Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
Former-commit-id: 129d546951798a7c839b420eb847baf1cebff2e2
2013-05-08 13:02:59 -05:00
Ben Steffensmeier
52845da6a8 Issue #1847 Allow painting with no Wind Data.
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c

Former-commit-id: c4eec589218d1c1265fd596646abd9dc2322fd74
2013-05-08 12:34:46 -05:00
Ron Anderson
4e63cd7a70 Merge "Issue #1988: Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
Former-commit-id: 790a0c78c95414ddec13294b68905b1d7bbb60a9
2013-05-08 12:21:28 -05:00
Ben Steffensmeier
dbb6e1abbf Issue #1954 Revert HucLevelGeometriesFactory
Former-commit-id: 0be6bba1ac6db873c54f72bdb7e267bd6cc2ce5a
2013-05-08 12:14:29 -05:00
Richard Peter
9b9c19c96f Merge "Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager." into omaha_13.4.1
Former-commit-id: 54afaa408fc663ed1d88883c843ce92ee41ac0cd
2013-05-08 11:28:58 -05:00
David Gillingham
110c7d2571 Issue #1988: Fix iscMosaic regression caused by DR 1941.
Change-Id: I6b2f28c6c1519645d3eedb081288e35545612ca9

Former-commit-id: d0ef15027759d301e16a4897b8ddc4a6670de2fb
2013-05-08 11:14:23 -05:00
Mike Duff
c27de86f3d Issue #1976 - Fix race condition in Hydro TS
Peer Review comments

Change-Id: I124176dcc242709f30f19152e7ecb6fda4e7c861

Former-commit-id: 80c08a73c2bcaf853e63c175334b9f00dd93d696
2013-05-07 13:17:33 -05:00
Steve Harris
8379977673 13.4.1-6 baseline
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
2013-05-07 08:47:39 -04:00
Brad Gonzales
13c449eb5d Issue #1979 Fix Redbook frame issue parsing redbook data with a default header at the end of the buffer.
Change-Id: I30d89f84bbecf3250f491106b337c9c12ec88bb9

Former-commit-id: 90e1c8b65baad0af8f8a7a27b6b308b504c1be27
2013-05-06 17:41:43 -05:00
Brad Gonzales
e80649cadf Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager.
Amend: Removed second create index pattern in SchemaManager and added a contains check
       instead.  Added a StringUtil replace method.
       In StringUtil replace method, fixed increment of targetIndex before loop indexOf
       check.

Change-Id: Ic3538db7298e295470afad2b6cf63ea9bf0fc5fd

Former-commit-id: 1ed7ce737e6a8d42db2c70892fc2173b5000b44e
2013-05-06 12:05:11 -05:00
Ben Steffensmeier
721db403ad Issue #1930 Check for null in WatchesResource.
Former-commit-id: 7feb01b219e5ace4cd7df115c20c6f4f64869126
2013-05-06 11:40:08 -05:00
Richard Peter
083700d315 Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.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/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
	pythonPackages/qpid/bin/qpid-queue-count
	pythonPackages/qpid/bin/qpid-stat
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
	rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/x86_64/build.sh
	tests/.classpath

Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb

Former-commit-id: 9fb7a04d920e56496cdc896513da8fc54765c6d5
2013-05-05 14:25:36 -05:00
Steve Harris
85bbf6d242 13.4.1-5 baseline
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
2013-05-03 09:29:14 -05:00
Richard Peter
a3c86efdd1 Issue #1814: Update Slow Consumer to have max depth of 100M
Change-Id: I53bd0260622d0fc79d16141b9d64ea2cb5b28310

Former-commit-id: fc038aa3edb9c017a926fc3124eb35966b55aa4f
2013-05-03 09:25:48 -05:00
Steve Harris
1a6fd7edfd 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: dca18e1b350f5424ec129b6cd0d602ceb86e119b
2013-05-03 09:20:30 -05:00
Ben Steffensmeier
926af755fe Issue #1949 Update GFE data access in Product Browser, Volume Browser, and Data Access Framework.
Former-commit-id: 5539e83d56681d680ec92378b4dd408da2f94ae6
2013-05-02 15:55:25 -05:00
Brad Gonzales
b0bc5fc2c5 Issue #1970 Fixes for Hibernate dataURI and indsertTime Index generation.
Amend: Removed Inheritance strategy from GridRecord.
       Removed dataURI_idx from PluginDataObject.

Change-Id: If04f5388b339ffaafde1693917cf90a8512a1225

Former-commit-id: 82722bc34cb49b8934063ab6ebdcf66a9bcbe024
2013-05-02 15:28:10 -05:00
Richard Peter
f26d10f005 Merge "Issue #1949 Switch Product Browser from uengine to DbQueryRequest." into omaha_13.4.1
Former-commit-id: 121f65c92214d50fc2c5da0151ee3e42455bc934
2013-05-02 15:12:04 -05:00
Ben Steffensmeier
3342990f2f Issue #1949 Force ModelSounding in Vb to play nicely with others.
Former-commit-id: 5e2b6a200aca6d9bbd1b00b9d61f1b8e723547ab
2013-05-02 14:19:04 -05:00
Ben Steffensmeier
0982076772 Issue #1949 Switch Product Browser from uengine to DbQueryRequest.
Former-commit-id: 9b78ecbaf0d54d95c4cc94d2a11a36c250f48a32
2013-05-02 14:15:23 -05:00
Steve Harris
d33e5861aa 13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
2013-05-02 10:00:38 -05:00
Richard Peter
092c0364de Issue #1949: Fix build
Change-Id: I52ede4bfe94a88331989dfb8320b0dfdeedae71d

Former-commit-id: cf8ccf45ed32c50a84dd59de42f6e87b83ff6a21
2013-05-02 09:06:44 -05:00
Ron Anderson
d443cbd61f Merge "Issue #1949: Normalize the GFE Database, incorporate peer review comments, add upgrade script. Updated GFE DataURI to individual fields to fix D2D autoUpdate." into omaha_13.4.1
Former-commit-id: 043f3d6c60817e8f0d38a304a4b36d18caf01399
2013-05-01 17:26:26 -05:00
Nate Jensen
b5c86153d3 Merge "Issue #1962 Allow Viirs Decoder to accept numeric missing values." into omaha_13.4.1
Former-commit-id: 80a023582f55b076cfbb27e260ed357c35d68ad7
2013-05-01 17:10:03 -05:00
Nate Jensen
64352aa48b Merge "Issue #1968 Prevent deadlock on thinclient startup" into omaha_13.4.1
Former-commit-id: 3cce6d362306953c927e1c02d76f3be68d80ad31
2013-05-01 16:39:01 -05:00
Richard Peter
fd35df4aa1 Issue #1949: Normalize the GFE Database, incorporate peer review comments, add upgrade script.
Updated GFE DataURI to individual fields to fix D2D autoUpdate.

Change-Id: I9cf7a2192ef2e4c0956aa0836d69767c1ede0624

Former-commit-id: 9df464410f7d87df9c6ce52958431d0718ed7d5a
2013-05-01 15:50:10 -05:00
Dustin Johnson
ff6220147b Issue #1968 Prevent deadlock on thinclient startup
Change-Id: I522082d3c633b583e9b72941ec17464731ceba5e

Former-commit-id: fd9305775d1c0de574d1c0c9b47aac911b356de6
2013-05-01 15:48:18 -05:00