Commit graph

16 commits

Author SHA1 Message Date
Ben Steffensmeier
4f488940de Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 7c91a83521 [formerly dab2af2df5] [formerly 4209e014d8] [formerly 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]
Former-commit-id: 79015595ee
Former-commit-id: d2f613e06b0e271020b7c52b497bdf43641096be [formerly 1c51f0b5f2]
Former-commit-id: 9cf071338e
2013-05-08 18:39:25 -05:00
Richard Peter
e4f3d60d90 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: d11666193f [formerly 17a5f519cc] [formerly 39b90191a6e347610683f41fb7bca631ffab07d3 [formerly 083700d315]] [formerly 2b496de6d8 [formerly 083700d315 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]
Former-commit-id: 2b496de6d8
Former-commit-id: a57ab1971925eee09755783786207fd3536b9553 [formerly 349bcc15d7]
Former-commit-id: 398e808300
2013-05-05 14:25:36 -05:00
Brad Gonzales
2c286cbca9 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: 5683873c24 [formerly 51a22d0146] [formerly b0bc5fc2c5] [formerly 89464e243e [formerly b0bc5fc2c5 [formerly 82722bc34cb49b8934063ab6ebdcf66a9bcbe024]]]
Former-commit-id: 89464e243e
Former-commit-id: ab43aea7d7d22f7038a896d00f2afeda839cbd74 [formerly 96332b9e63]
Former-commit-id: b9ba987cbe
2013-05-02 15:28:10 -05:00
Steve Harris
7d085660f8 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]
Former-commit-id: 4357e2dacc
2013-05-02 10:00:38 -05:00
Brad Gonzales
2c2f7f7edf Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
       added sequence delta script.

Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1

Former-commit-id: c7318522e1 [formerly 005c935be6] [formerly dc37712fda] [formerly b75ef08190 [formerly dc37712fda [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]
Former-commit-id: b75ef08190
Former-commit-id: a9e91f46554d9caefb1866f0820680559c325801 [formerly 16f030294d]
Former-commit-id: a21b495206
2013-04-16 14:44:06 -05:00
Steve Harris
fe5020d315 13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]
Former-commit-id: abaf9f12f9
Former-commit-id: afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]
Former-commit-id: ed4150db5f
2013-04-09 08:37:12 -05:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
d2da55254b 12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]
Former-commit-id: 28018b8d9b
Former-commit-id: e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]
Former-commit-id: 8a41d325d2
2012-12-06 09:12:15 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
2012-11-07 12:41:20 -06:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
e528bb0df2 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]
Former-commit-id: dc50bc8443
2012-07-10 07:53:49 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Ben Steffensmeier
b0442fc51e Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4

Former-commit-id: 5957b76dd1 [formerly 4179defc4f] [formerly f016be988e] [formerly 73f6e9e322 [formerly f016be988e [formerly 500f3f03f5260cff3417021776204ccf6c035415]]]
Former-commit-id: 73f6e9e322
Former-commit-id: f32d9732e6d10fada260c6773e029c2f625b2454 [formerly 7bcbf3e3bc]
Former-commit-id: cb2addec0c
2012-02-03 17:33:32 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00