Commit graph

267 commits

Author SHA1 Message Date
Nate Jensen
6a60f2f8ee Merge "Issue add Python and XML Incremental Override, implemented for both Java and Python" into development
Former-commit-id: 52a3cabcae [formerly dd9d33f966] [formerly eedf5cfb2e] [formerly 52a3cabcae [formerly dd9d33f966] [formerly eedf5cfb2e] [formerly b438ff7294 [formerly eedf5cfb2e [formerly 834382386db28affb25c7ca00614d647f988c0e4]]]]
Former-commit-id: b438ff7294
Former-commit-id: ee07e8f95a [formerly 4c501588cf] [formerly 49054c345ee48e722637d72fb37be2754c6d1b7c [formerly ac7477c78b]]
Former-commit-id: 3d9a41d8e541bdf81909403831f9ea8926b5b044 [formerly e227f2907c]
Former-commit-id: 8dac3e828a
2013-05-02 14:04:25 -05:00
Matt Nash
e86a2bcf57 Issue add Python and XML Incremental Override, implemented for both Java
and Python

Change-Id: I293b6abcdffbd2cef35e9b986362113186583c55

Former-commit-id: a72e130f18 [formerly f544fdd9e1] [formerly 288bd3b02c] [formerly a72e130f18 [formerly f544fdd9e1] [formerly 288bd3b02c] [formerly 7943769110 [formerly 288bd3b02c [formerly 27f86d4c39ce8b8e708408511c820a5dd765e4cb]]]]
Former-commit-id: 7943769110
Former-commit-id: 25fac01538 [formerly 5b62180a2a] [formerly 09b0ecdb20cc917f603bc05f2a53cae1c74ee3ea [formerly ae21592cbf]]
Former-commit-id: 07822a8f4f1084499d7851ed610c106db7d9fd65 [formerly 40c3731f4a]
Former-commit-id: ccfcc23bee
2013-05-02 13:39:55 -05:00
Dustin Johnson
48f7cb5a08 Merge "Issue MADIS implementation peice in AWIPS II baseline" into development
Former-commit-id: 49801bd5e2 [formerly 48d8bf941a] [formerly 00dc4787f6] [formerly 49801bd5e2 [formerly 48d8bf941a] [formerly 00dc4787f6] [formerly 8a29b450c4 [formerly 00dc4787f6 [formerly e892ed6958df9141768b9593dee93492d8e707d3]]]]
Former-commit-id: 8a29b450c4
Former-commit-id: 1485c27bc1 [formerly 6ab64bbbcd] [formerly 8aca75081b62bccf75287ba01aa868a459ab98c3 [formerly f00d9146e4]]
Former-commit-id: 48f9f784326095786722fe118af521a422088734 [formerly fc203fe328]
Former-commit-id: 2b5b4cb493
2013-05-02 12:54:37 -05:00
Dave Hladky
ffb6dcd45b Issue MADIS implementation peice in AWIPS II baseline
Change-Id: Ice4af1f640cd9c8fb92ed129402b7300b92f65da

Former-commit-id: 449fe63bec [formerly f833c4cc35] [formerly a770e2fb99] [formerly 449fe63bec [formerly f833c4cc35] [formerly a770e2fb99] [formerly 0869f14084 [formerly a770e2fb99 [formerly d5ad257cb446a8605bb4df56cc1dba319f0e5abe]]]]
Former-commit-id: 0869f14084
Former-commit-id: c3b1aa9836 [formerly ba0db0d7d7] [formerly 7e02a78cf879d273d0feb128d2c456d73ca15fe4 [formerly d677614620]]
Former-commit-id: f66f309ea0d3fd39caa59c237e06ff7c9af1ca9a [formerly cfd01dd5e4]
Former-commit-id: 252ce5bfbd
2013-05-02 11:30:32 -05:00
Benjamin Phillippe
9aec29e371 Issue Implemented Pulling notifications on demand
Change-Id: I1d6debf2e67631708ec8471f50fd2c36b938abaf

Former-commit-id: 0035688cbc [formerly f0c56cc09d] [formerly 9962173468] [formerly 0035688cbc [formerly f0c56cc09d] [formerly 9962173468] [formerly bb7e91d673 [formerly 9962173468 [formerly 4696a86bd969bebbcc48363bd14fdf6c2234b836]]]]
Former-commit-id: bb7e91d673
Former-commit-id: 371776285f [formerly 84921616bb] [formerly 8203fc648f4a372634b856b5ff9ba3ee03102d34 [formerly 8fe6f260ca]]
Former-commit-id: b6e997c9b26d487951bbe1ed7cb7831315bf18e4 [formerly 68abfc8847]
Former-commit-id: 32b7d24807
2013-04-30 20:12:05 -05:00
Benjamin Phillippe
f399d960d4 Issue Implemented REST binding for registry
Change-Id: I604c02dc849e380f70e2d27fa1f2b30dadcf0776

Former-commit-id: c6ee9830c2 [formerly 9a7971c872] [formerly 9065ebcb65] [formerly c6ee9830c2 [formerly 9a7971c872] [formerly 9065ebcb65] [formerly 3d2e073dd7 [formerly 9065ebcb65 [formerly daef43d8947f690d15f9314f85b8cf31d30c06ab]]]]
Former-commit-id: 3d2e073dd7
Former-commit-id: 1dfad752b2 [formerly 6edfda46bf] [formerly 81b93e88fcb675dc12f014d71b56dacd0de0e82f [formerly cf7da4b001]]
Former-commit-id: a64dd673d7fafc3bb55dd063e5c4541a9db2b723 [formerly a45aba204f]
Former-commit-id: 90d4a9daec
2013-04-22 13:17:53 -05:00
Benjamin Phillippe
3733212782 Issue Implemented ebxml registry replication
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: fa6cdf46db [formerly e3f3483b51] [formerly 120906de78] [formerly fa6cdf46db [formerly e3f3483b51] [formerly 120906de78] [formerly ec69cdeb44 [formerly 120906de78 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]]
Former-commit-id: ec69cdeb44
Former-commit-id: 0a930ce83c [formerly e5fbf006dd] [formerly 8dba2ff501e80c05042800d7e6c73e3267e77ee2 [formerly c0099a8a39]]
Former-commit-id: 95c16add15912c7c114c1119ff48e3bd9099e7ee [formerly d9b5511b8b]
Former-commit-id: 1967c632e5
2013-04-12 11:27:45 -05:00
Matt Nash
9044f422ba Issue convert parameters to Strings and make sure to return them
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 6f12e80c0d [formerly 64323fc0af] [formerly cd77308fac] [formerly 6f12e80c0d [formerly 64323fc0af] [formerly cd77308fac] [formerly 6c488cee05 [formerly cd77308fac [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]]
Former-commit-id: 6c488cee05
Former-commit-id: 6e4cdda323 [formerly 4ee6085bda] [formerly b7dde24ffa640c3ec2a075a60bbac138bc9b7837 [formerly 7dd72ab7d5]]
Former-commit-id: bb7a2e01e84d6a44c089c22831f81e386f072be2 [formerly 6969b0c0ae]
Former-commit-id: 63a13ef503
2013-04-12 09:31:23 -05:00
Matt Nash
eb17cb0e94 Issue add default values for times so they don't need to be sent in from
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 01e9ab8a06 [formerly 2ab1cf8abb] [formerly 3af61d7117] [formerly 01e9ab8a06 [formerly 2ab1cf8abb] [formerly 3af61d7117] [formerly b44ee44664 [formerly 3af61d7117 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]]
Former-commit-id: b44ee44664
Former-commit-id: 6a755f6a4b [formerly e6fc7942b8] [formerly 2a5d354ea6b4a6308cc09c3d485c9d2ea3778f71 [formerly c95e825d35]]
Former-commit-id: 8b3973aa378e7fd3ef3866d756662f36aa72b401 [formerly 7b25f73a9a]
Former-commit-id: dc0f234f02
2013-04-12 09:31:16 -05:00
Dustin Johnson
22a62fea55 Issue Change build.edex build.xml to support building work assignment features after main build
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9

Former-commit-id: 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 1365d5c9af [formerly 3be6669f1b [formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 6ad3355dad [formerly 1960bcbf11] [formerly c88cf84fe3b042c261af4f646c01752674a7c487 [formerly 83f6fb720c]]
Former-commit-id: db422ebb6e9f3dceaec4bd0424043a548411b890 [formerly f817dbe495]
Former-commit-id: 9d04ba83a5
2013-03-28 11:43:24 -05:00
Steve Harris
f2a81e18e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
cdad316568 Issue - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Dustin Johnson
e01c368285 Issue Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 1684507bdb [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]]
Former-commit-id: 1684507bdb
Former-commit-id: 49c53e5443 [formerly 2591041c9d] [formerly 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b]]
Former-commit-id: 9f863145bc53a4b320485d6a4c216ac1f5122e9a [formerly c5685dbe9f]
Former-commit-id: 198fb2b6ae
2013-03-27 15:38:36 -05:00
Richard Peter
e962480999 Issue : Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 5287a3296b [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: b2a73c8d44 [formerly 6923e10550] [formerly 4a26b55e8490ddfd0f35dfb9dc124a2fe903a855 [formerly f99242f539]]
Former-commit-id: 1fa4e3bd516a4977c836f977106434dab62287a5 [formerly 33c602b13e]
Former-commit-id: 786b68279d
2013-03-26 20:55:42 -05:00
Steve Harris
56522d8cf5 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01 [formerly 5bb29627dc] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c]
Former-commit-id: 0bd1d5bdef
2013-03-26 12:47:40 -05:00
David Gillingham
c3a87654de Issue : Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly bebfc60317 [formerly 1df8d39919 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]]
Former-commit-id: bebfc60317
Former-commit-id: 1c24ec516d [formerly bf196a7782] [formerly a809765d33e0a62afbe50224ec11b4f9d9365c4f [formerly 07487a27dc]]
Former-commit-id: 04ffee131ad16fc238cce01414a4a0035486bafd [formerly 45bf26aa00]
Former-commit-id: 3b29423947
2013-03-26 10:33:42 -05:00
Steve Harris
81a8604bfe Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]]
Former-commit-id: a23cecdb26
Former-commit-id: 5be2208aaf [formerly 02105701a0] [formerly 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]]
Former-commit-id: 1234c0205c914f2be5f36fcfc47900e46f0e87db [formerly e6ab1deba2]
Former-commit-id: feba54ac83
2013-03-26 10:12:34 -05:00
Mike Duff
868a6c3ddf Issue Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	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.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	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/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 1314976753 [formerly b366778df0] [formerly 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]]
Former-commit-id: 428a7b37d44680f4388cb79776fa256ccd460279 [formerly efec4d0365]
Former-commit-id: 493014d466
2013-03-26 09:19:39 -05:00
Richard Peter
228453439d Merge "Issue Refactored DD transaction management" into development
Former-commit-id: 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 5c92140024 [formerly c3268aa02c [formerly b8516f99386ded052745e766911094edfd57d7ec]]]]
Former-commit-id: 5c92140024
Former-commit-id: d33b9859c2 [formerly 072bc7affc] [formerly 76ef672a3d495ecff9dda9924de866473ac56ce0 [formerly 351f08dba3]]
Former-commit-id: 77d040b2214a8a9c514a25092b9dd5acf0743cce [formerly bcb5b0b73e]
Former-commit-id: af956fe92d
2013-03-25 15:37:18 -05:00
Bryan Kowal
a1de8e0a67 Issue - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 6758a9a50d [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]]
Former-commit-id: 6758a9a50d
Former-commit-id: f1b0e60b8e [formerly 1eba8622d4] [formerly b5e09dca5c13d2f76056db298c6ddcd8fba31a7e [formerly 4c02dabb3d]]
Former-commit-id: 0741dba9cedb08ccd4a8faa71fb209bc0dbf6617 [formerly e41f926ac2]
Former-commit-id: d5c958b2f8
2013-03-25 15:23:32 -05:00
Bryan Kowal
7ef1b5e065 Issue - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly a6cd17feeb [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 5012e869e3 [formerly 2093c6a495] [formerly 1710b26cc53566e26fc66c7ee6bcd14b0dbcbc08 [formerly c4cec34e47]]
Former-commit-id: 31db227b7bdc186a52966c1efdd832477bc27159 [formerly 99a3e25b3d]
Former-commit-id: 3728413ecf
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
e7ea63963d Issue Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129 [formerly 541646148b] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b]
Former-commit-id: 5e50d32bdb
2013-03-25 15:15:38 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Bryan Kowal
a9dd3bd622 Issue - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462 [formerly ac0ef6e7b9] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -05:00
Steve Harris
616cddf60c Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Steve Harris
0929de5965 Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 96ba08115a [formerly d00dc0d174] [formerly 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]]
Former-commit-id: b81ab6022fde7cae7ff4586a3467e9e741b445f7 [formerly 6d4512fa3a]
Former-commit-id: 352c267fc9
2013-03-20 13:45:11 -05:00
Dave Hladky
c290073444 Issue Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: a7462a5125 [formerly 01c6ff12a0] [formerly d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]]
Former-commit-id: 230698475e3964c6e08fa5002b60e4edb7657b26 [formerly 8299b2872a]
Former-commit-id: 1aef08f449
2013-03-20 12:41:33 -05:00
Steve Harris
5411621351 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3c492badbc [formerly 7e96d841d9] [formerly 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]]
Former-commit-id: e83406d2275f6117c72406e8ae7298dd5995a819 [formerly 65f522fc87]
Former-commit-id: 37beeaab69
2013-03-19 14:22:56 -05:00
Dustin Johnson
fec2db4a51 Merge "Issue Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly 8363eba409 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]]
Former-commit-id: 8363eba409
Former-commit-id: 2896b034a7 [formerly 3c8e14edc7] [formerly bf91004f3796358ffc74a0f0628be3abb249249e [formerly e0b6e6187e]]
Former-commit-id: 29c699a80c9e5e2a63781b6b624594e5c7c717ce [formerly 889953c712]
Former-commit-id: 17fe9aee59
2013-03-19 13:09:48 -05:00
Dave Hladky
07b8f90014 Issue Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: e0d90738ad [formerly 618f737fab] [formerly 71c2eba9b6609730384eaad2e834b311fb5eefb6 [formerly f0244f54a4]]
Former-commit-id: 7fb36c3c0bac714c21eadf0ce71c66d6f3e066cc [formerly 64f8c46e64]
Former-commit-id: af0898807b
2013-03-19 13:08:14 -05:00
Steve Harris
4c10c7a5be Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
2013-03-18 16:52:00 -05:00
Steve Harris
c1bb0c2749 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
2013-03-18 16:43:22 -05:00
Bryan Kowal
33b56397a3 Issue - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]]
Former-commit-id: 7fd035256d
Former-commit-id: 9d8b41c8c7 [formerly 3e8d5449fc] [formerly 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec]]
Former-commit-id: 91ab574f18aa46466914129e5425a627996ad4d1 [formerly 56f2b3f0c2]
Former-commit-id: 81ebbd5a5b
2013-03-18 16:36:33 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00
Dustin Johnson
090d1fe72a Issue Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 43a9f608ef [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]]
Former-commit-id: 43a9f608ef
Former-commit-id: d8880e29b6 [formerly 7adf94e9f6] [formerly 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4]]
Former-commit-id: b520365a67b13e0f4c76818883c281e85883a6aa [formerly a08059dd34]
Former-commit-id: 83034c3f43
2013-03-15 11:51:58 -05:00
Bryan Kowal
ff3b0b0645 Issue - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f3835d85a0 [formerly b0d31729e8] [formerly 0d33c86abe] [formerly f3835d85a0 [formerly b0d31729e8] [formerly 0d33c86abe] [formerly 8c0ee91c5b [formerly 0d33c86abe [formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: 21e0725cdc [formerly ebaea489bc] [formerly 59d9eafff7a1f7424f1ff366a16e0923edbc8e89 [formerly e83033b314]]
Former-commit-id: 09091a45851f5017a3373897df85539afa1505f0 [formerly bc0c82dad8]
Former-commit-id: a897e41993
2013-03-14 10:37:20 -05:00
Bryan Kowal
ce667ef7f5 Issue - remove references to the DEV_MODE jvm parameter
- removed ScriptLibraryManager.java

Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e

Former-commit-id: 123f4a8de9 [formerly 19b26c9f04] [formerly dd811f674b] [formerly 123f4a8de9 [formerly 19b26c9f04] [formerly dd811f674b] [formerly 58316907ae [formerly dd811f674b [formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]]]
Former-commit-id: 58316907ae
Former-commit-id: b4316f574e [formerly 8c91869c8e] [formerly 5a526894932882f5beada1042dc714d09a4e90c4 [formerly 86c287bb33]]
Former-commit-id: e5013bbbea796da871243b85a1f893100b7f1a4e [formerly 39ff5c7945]
Former-commit-id: 851eb395f7
2013-03-14 09:54:11 -05:00
David Gillingham
c274c26346 Issue : Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Former-commit-id: e7a9930ee9 [formerly 87013aad89] [formerly 7c74510723] [formerly e7a9930ee9 [formerly 87013aad89] [formerly 7c74510723] [formerly 566927980a [formerly 7c74510723 [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]]]
Former-commit-id: 566927980a
Former-commit-id: e79e4a7f7d [formerly d8dd50f2ba] [formerly 07b617a330b24e8266d4259815c46e96ac32f768 [formerly 90b8c80837]]
Former-commit-id: 788c23cfd8404383ca37105cb8ff85c42e716b52 [formerly b121f99015]
Former-commit-id: 34a1c7b784
2013-03-13 17:14:59 -05:00
Bryan Kowal
f1854dd760 Issue - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 0b6a31d7ca [formerly f6139755a5] [formerly 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024]]
Former-commit-id: 53b06b05ba798c5f2f0c58de3b9cd5f1c88b5850 [formerly 1e9054ce15]
Former-commit-id: ea0950d836
2013-03-13 14:44:05 -05:00
Dave Hladky
b111edeb8b Issue Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Steve Harris
072065191b Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 47cde9bd09 [formerly bca46a1354] [formerly 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]]
Former-commit-id: afba0e5b2a5a76c08ffa616eefd96f2ca6363113 [formerly 5232592cfa]
Former-commit-id: 346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4 Issue Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	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
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Nate Jensen
c3eee1d672 Issue log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 5f343a50ae [formerly 21863c5db5] [formerly 5effcf2be10b9fa355b692253b6dde537d5459c4 [formerly d7902aba68]]
Former-commit-id: cee6519ae8def3eb8dd9176022e583ac56b8f782 [formerly a2f804350a]
Former-commit-id: d0bed867b0
2013-03-07 16:49:40 -06:00
Steve Harris
b64731872c Merge branch 'omaha_13.3.1' into development
Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 1709c34b8f [formerly 4a0b8772ec] [formerly 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8]]
Former-commit-id: ad6ef96c444820a88fa41f79cf60d91bc2c26386 [formerly 46d0c9fcee]
Former-commit-id: 2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00