Bryan Kowal
dc2dc31f7e
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 72bdbbb7f6
[formerly 6106369d4c
] [formerly f325038538
] [formerly f0eb7d3285
[formerly f325038538
[formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]]
Former-commit-id: f0eb7d3285
Former-commit-id: 8cd05408fb45131c5569dd6fe66f49be87474a71 [formerly 54113e9b29
]
Former-commit-id: fd68cd7a04
2013-03-18 18:15:26 -05:00
Steve Harris
027eda5dce
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 7fcf9f1cb2
[formerly b8f0635ad6
[formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde
]
Former-commit-id: 2a26783ba7
2013-03-18 16:52:00 -05:00
Steve Harris
0e9919f6be
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 c18b96dc4c
[formerly 1a999fee5a
[formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8
]
Former-commit-id: ea27f9cd17
2013-03-18 16:43:22 -05:00
Bryan Kowal
9d8b41c8c7
Issue #1741 - 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 7fd035256d
[formerly b954bc17bf
[formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]
Former-commit-id: 7fd035256d
Former-commit-id: 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec
]
Former-commit-id: 3e8d5449fc
2013-03-18 16:36:33 -05:00
Steve Harris
2fd4ac9397
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940
[formerly bc9df0a8f9
] [formerly f97d78994b
] [formerly c15b3ffe20
[formerly f97d78994b
[formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea
]
Former-commit-id: 81a3f29afc
2013-03-18 15:43:32 -05:00
Dustin Johnson
b4c83331db
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: 1fb27b205a
[formerly 36cc80590c
] [formerly b7a5311dde
] [formerly 7fe3c254fd
[formerly b7a5311dde
[formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]]
Former-commit-id: 7fe3c254fd
Former-commit-id: 9bd17f5ccc6a8fce1d466bbffddc89e3dcf31e69 [formerly 55095f0041
]
Former-commit-id: 7afc4a083b
2013-03-15 16:14:17 -05:00
Nate Jensen
568f988ef9
Issue #1795 speed up publish by optimizing publish time updates in grid histories
...
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8
Former-commit-id: 3b331be9f6
[formerly 30ddd909bf
] [formerly 827d546debc5772bc4391f020a12a353ee05f1e9 [formerly e65267d5f3
]] [formerly 235952a115
[formerly e65267d5f3
[formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]
Former-commit-id: 235952a115
Former-commit-id: 322940c9800f51152a2cd23a4f14a10dee589147 [formerly dad08657aa
]
Former-commit-id: 4ea1508baa
2013-03-15 16:10:11 -05:00
Nate Jensen
5e8498d2db
Merge "Issue #1638 Fixed Velocity templates for windows build" into development
...
Former-commit-id: ba81904ec9
[formerly cab8a23ebd
] [formerly f3fbae64b3
] [formerly d14dfe215c
[formerly f3fbae64b3
[formerly 640eb368b7026651de34db2154fb955930d65040]]]
Former-commit-id: d14dfe215c
Former-commit-id: a0d830224d381066b98e46fa05f68e7a3f50d428 [formerly 0191c8bff0
]
Former-commit-id: 74df582fac
2013-03-15 13:49:56 -05:00
Max Schenkelberg
f294d9aa8a
Issue #1638 Fixed Velocity templates for windows build
...
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a
Former-commit-id: 93c416e914
[formerly 07a6fd494d
] [formerly 2c3ee8d35d
] [formerly beb801517e
[formerly 2c3ee8d35d
[formerly da9666be71adf84f394f255406a66afa6c3f28be]]]
Former-commit-id: beb801517e
Former-commit-id: 1728f5f643c879365568ae1dc33fadaaaaa596c0 [formerly 582de5717c
]
Former-commit-id: c3232f2581
2013-03-15 12:16:59 -05:00
Dustin Johnson
d8880e29b6
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 65f87506b7
[formerly fff7e7983f
] [formerly ecb0d2c826
] [formerly 43a9f608ef
[formerly ecb0d2c826
[formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]
Former-commit-id: 43a9f608ef
Former-commit-id: 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4
]
Former-commit-id: 7adf94e9f6
2013-03-15 11:51:58 -05:00
Roger Ferrel
dfbd824211
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 24868f7ed5
[formerly dadf8a9e4c
] [formerly 0089e24579
] [formerly b01bb935c3
[formerly 0089e24579
[formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]]
Former-commit-id: b01bb935c3
Former-commit-id: b11e4827ee12c6a982cc5d1a4fc3306a804a2efe [formerly 08990f97f8
]
Former-commit-id: 382bb7c16b
2013-03-15 10:26:30 -05:00
Roger Ferrel
3693e9dfeb
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 32ba1814f5
[formerly fcbda4e0de
] [formerly 4230e1a9b8
] [formerly 17a41bf063
[formerly 4230e1a9b8
[formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]]
Former-commit-id: 17a41bf063
Former-commit-id: 183b27d474d2061440f4cf3fd19e327acad33523 [formerly 006062502e
]
Former-commit-id: e88e52e406
2013-03-15 09:00:00 -05:00
Roger Ferrel
269127174c
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: b6a18b2d96
[formerly 76507ebcc5
] [formerly 015fc9b8f8
] [formerly 34ea46099e
[formerly 015fc9b8f8
[formerly ad772f0a3eb944117614f029a2c3659e5c774599]]]
Former-commit-id: 34ea46099e
Former-commit-id: 08234f862f3dd3950c644ed09abf867def44c3c1 [formerly 7eae71038f
]
Former-commit-id: 60e7b4be62
2013-03-15 08:17:50 -05:00
Lee Venable
a0298d4199
Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
...
Former-commit-id: a1ea0d020c
[formerly 57d7559797
] [formerly 456fd056f4
] [formerly 93e99b64a6
[formerly 456fd056f4
[formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: db8baa1a7f8057094afd75e9aeaf6f46c5dd6820 [formerly 3a1dc41b50
]
Former-commit-id: ba4673b99a
2013-03-14 17:19:38 -05:00
Dave Hladky
19117f1851
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
...
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: f7ccf2e765
[formerly a1c4148918
] [formerly 9b495681ec
] [formerly c57d5574ef
[formerly 9b495681ec
[formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]
Former-commit-id: c57d5574ef
Former-commit-id: a513fe6a10c22c44c2f7c793a12913414d1f9b36 [formerly db207a732c
]
Former-commit-id: 3ba473351b
2013-03-14 15:59:39 -05:00
Roger Ferrel
cec76b08bf
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: a19092d5c2
[formerly 818b856f97
] [formerly c43b7777e1
] [formerly ebe57f1cbc
[formerly c43b7777e1
[formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: a4411b7fa0720ced4d24e4567246f0516fe411f4 [formerly ff944b4768
]
Former-commit-id: 46428ed944
2013-03-14 15:38:08 -05:00
Ron Anderson
c6598f3869
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
...
Former-commit-id: 1864ba24e5
[formerly 60af3ad63e
] [formerly 16d93dab84
] [formerly fc749ff3eb
[formerly 16d93dab84
[formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]
Former-commit-id: fc749ff3eb
Former-commit-id: cdf68ae1b9e656919543c5343fa44ed63c766ab2 [formerly 7087e1ebe7
]
Former-commit-id: 97a38fd3c5
2013-03-14 14:55:31 -05:00
Lee Venable
c0d412397c
Merge "Issue #1790 Changes for non-blocking PointDataControlDlg dialog." into development
...
Former-commit-id: f5f0b284d7
[formerly 966497c2a9
] [formerly 03f81c4f49
] [formerly 7c9ce3dfb9
[formerly 03f81c4f49
[formerly 27b25500f8346d73b0a12ca8597e7b0a6282ad0c]]]
Former-commit-id: 7c9ce3dfb9
Former-commit-id: 546fc34b7d27513704c590425ed3208030340083 [formerly 21c657ce8a
]
Former-commit-id: 9125432046
2013-03-14 13:44:15 -05:00
Ben Steffensmeier
55d80d760f
Issue #1793 Performance improvements for TCMWindTool
...
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 3f0030521d
[formerly 7335a2336e
] [formerly 7aa8b2d3eb
] [formerly 45a5cffdf3
[formerly 7aa8b2d3eb
[formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee
]
Former-commit-id: e5b9e0ca46
2013-03-14 13:26:08 -05:00
Greg Armendariz
ef59159bb9
Removed merge code from the source code
...
Former-commit-id: 05d7892c3b
[formerly 2bb407ea8b
] [formerly 5511f0b3a6
] [formerly 2f9136843b
[formerly 5511f0b3a6
[formerly 9652fe27ae424cba83296a714a720e554390550a]]]
Former-commit-id: 2f9136843b
Former-commit-id: 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7
]
Former-commit-id: b79ecc28e3
2013-03-14 11:15:08 -05:00
Bryan Kowal
9eddd7eca0
Issue #1663 - updated libpq.so for the native hydro applications
...
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*
Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1
Former-commit-id: 4f62288851
[formerly 675e97b219
] [formerly 379e19e8a4
] [formerly 28eb671ed0
[formerly 379e19e8a4
[formerly 2aed340ede1daa86607d7854cf48bba23dffaa61]]]
Former-commit-id: 28eb671ed0
Former-commit-id: 4e43458f686c895864df23ff40ffdfa68150f68d [formerly bfae338f1c
]
Former-commit-id: 6d0eb4f360
2013-03-14 10:40:18 -05:00
Bryan Kowal
21e0725cdc
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: f3835d85a0
[formerly b0d31729e8
] [formerly 0d33c86abe
] [formerly 8c0ee91c5b
[formerly 0d33c86abe
[formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: 59d9eafff7a1f7424f1ff366a16e0923edbc8e89 [formerly e83033b314
]
Former-commit-id: ebaea489bc
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
964fc25677
Issue #1777 fix subgridding range problems
...
Former-commit-id: 81f4bb55fc
[formerly 5e81f2154d
] [formerly 5bd20414eb
] [formerly 0daa5817d0
[formerly 5bd20414eb
[formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]
Former-commit-id: 0daa5817d0
Former-commit-id: 3bef982b8d104b6bd033477b34c99e0da65ce9ad [formerly a6140145a4
]
Former-commit-id: d22cbc7ce9
2013-03-14 09:56:00 -05:00
Bryan Kowal
b4316f574e
Issue #1772 - remove references to the DEV_MODE jvm parameter
...
- removed ScriptLibraryManager.java
Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e
Former-commit-id: 123f4a8de9
[formerly 19b26c9f04
] [formerly dd811f674b
] [formerly 58316907ae
[formerly dd811f674b
[formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]]
Former-commit-id: 58316907ae
Former-commit-id: 5a526894932882f5beada1042dc714d09a4e90c4 [formerly 86c287bb33
]
Former-commit-id: 8c91869c8e
2013-03-14 09:54:11 -05:00
Nate Jensen
b74d6315a6
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 14da2b6cc3
[formerly 9dbb7660a7
] [formerly 29b4cd2fb5
] [formerly 490ffe2772
[formerly 29b4cd2fb5
[formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9
]
Former-commit-id: e2e9a845d5
2013-03-14 09:48:16 -05:00
Roger Ferrel
463545471a
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
...
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: c6b64c828c
[formerly c556928998
] [formerly dae3fb5938
] [formerly 62b241a548
[formerly dae3fb5938
[formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]]
Former-commit-id: 62b241a548
Former-commit-id: 07c0e26a4def2d1580d95e8b371943bfc4d36663 [formerly 09f4c18b5c
]
Former-commit-id: 3baa2e9220
2013-03-14 08:22:05 -05:00
Ben Steffensmeier
a440445437
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: dcf02199ea
[formerly a9695abb45
] [formerly 22624ba5d3
] [formerly 52c167cf00
[formerly 22624ba5d3
[formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746
]
Former-commit-id: 2d622e6053
2013-03-13 18:52:52 -05:00
Ron Anderson
87cd340e38
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: f9c7fa9613
[formerly 0c881b4a85
] [formerly 3b65608373
] [formerly 61f74305e2
[formerly 3b65608373
[formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b
]
Former-commit-id: de14cd0baa
2013-03-13 17:16:37 -05:00
David Gillingham
e79e4a7f7d
Issue #1759 : 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 566927980a
[formerly 7c74510723
[formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]]
Former-commit-id: 566927980a
Former-commit-id: 07b617a330b24e8266d4259815c46e96ac32f768 [formerly 90b8c80837
]
Former-commit-id: d8dd50f2ba
2013-03-13 17:14:59 -05:00
Ben Steffensmeier
7e998aa197
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: a6a1d9bec7
[formerly 37bae0988b
] [formerly 4c150b0fd6
] [formerly 89eb902284
[formerly 4c150b0fd6
[formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39
]
Former-commit-id: f5680beaa9
2013-03-13 17:09:20 -05:00
Nate Jensen
d7696aa692
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: 4db98f508d
[formerly d0db96df45
] [formerly dbd2729336
] [formerly eaef235e8e
[formerly dbd2729336
[formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]
Former-commit-id: eaef235e8e
Former-commit-id: 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442
]
Former-commit-id: 15b3d5add6
2013-03-13 16:17:44 -05:00
Bryan Kowal
0b6a31d7ca
Issue #1663 - 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 5e86ef080e
[formerly 729bc9c4bb
[formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024
]
Former-commit-id: f6139755a5
2013-03-13 14:44:05 -05:00
Dave Hladky
68114535f2
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5
[formerly 765be278bb
] [formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 38b952a220
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8
]
Former-commit-id: 9e97fc9efe
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
6e0c60c210
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
...
Former-commit-id: 45cf2fd0ff
[formerly 51955a719a
] [formerly 36b3c16a42
] [formerly ddf2092bde
[formerly 36b3c16a42
[formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]
Former-commit-id: ddf2092bde
Former-commit-id: 9ff9ba942dcb40894a6b2a25b30b686d76272ff6 [formerly 247c9f6c1f
]
Former-commit-id: a1ca2ae2d7
2013-03-13 13:21:16 -05:00
Steve Harris
45a2d0501d
13.3.1-7 baseline
...
Former-commit-id: 23faf84455
[formerly 97d2f521e4
] [formerly a72254cc75
] [formerly e12ed113ae
[formerly a72254cc75
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca
]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Greg Armendariz
065fb32918
Merge "Issue #1638 fix build" into development
...
Former-commit-id: 4f29b438ac
[formerly 28eec498f3
] [formerly cc168cb94c
] [formerly a06a730696
[formerly cc168cb94c
[formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]]
Former-commit-id: a06a730696
Former-commit-id: 637e19f33ae49ff55331c55f304ac4387824f758 [formerly 12e912c548
]
Former-commit-id: f121df7e86
2013-03-13 08:56:00 -05:00
Nate Jensen
58cc71f75d
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 84ea117d75
[formerly 975d044ba6
] [formerly 192fe9a724
] [formerly 1cbc7bbfdc
[formerly 192fe9a724
[formerly fe7a28034739ec871528f041cfa7a488e5c71378]]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: f53aed250ff25cfca29a3a019820f483de4707c6 [formerly 733186900f
]
Former-commit-id: 5067a7b372
2013-03-13 08:50:26 -05:00
Dustin Johnson
c971ba7c89
Issue #1784 Update ColorMapParameters import for ncep plugins
...
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8
Former-commit-id: 4b9b444ef6
[formerly a5e0b421b5
] [formerly 9cd29d7625
] [formerly 0932affd16
[formerly 9cd29d7625
[formerly 884757847d855af099219c8ef2715a6319913646]]]
Former-commit-id: 0932affd16
Former-commit-id: dc78bf38c6ff41dd21542beb50a1f458f7032ab0 [formerly 64d8fc0ea3
]
Former-commit-id: 9f81b57ec0
2013-03-13 08:45:54 -05:00
Dustin Johnson
fdaa9b5ce7
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 2676e08fdd
[formerly 2983ed29e4
] [formerly 71365cd945
] [formerly 1930183036
[formerly 71365cd945
[formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]
Former-commit-id: 1930183036
Former-commit-id: 9459f282f836590ae975e73dd24d60edd299352a [formerly 48a96911c8
]
Former-commit-id: f5a3b57107
2013-03-13 08:39:08 -05:00
Steve Harris
f92bc8f3d4
13.3.1-6.1 baseline
...
Former-commit-id: 3ea50babf5
[formerly 6d96471b9b
] [formerly fa9d260c2b
] [formerly a062803c8c
[formerly fa9d260c2b
[formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]
Former-commit-id: a062803c8c
Former-commit-id: 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330
]
Former-commit-id: 2e1dbdc10d
2013-03-13 08:28:26 -05:00
Roger Ferrel
b2845a11d0
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
...
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: 82b526851a
[formerly f912d9ece3
] [formerly c5a2786c84
] [formerly b5743e8f9b
[formerly c5a2786c84
[formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]
Former-commit-id: b5743e8f9b
Former-commit-id: b8373ea3e1f95cfdea39442e15da79444813af3c [formerly 8bb9044e3a
]
Former-commit-id: a9a0a471f9
2013-03-12 16:58:06 -05:00
Nate Jensen
8778e9f945
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 33b73b008f
[formerly 37d996c64c
] [formerly 4486bd9941
] [formerly 676b3c9d11
[formerly 4486bd9941
[formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]]
Former-commit-id: 676b3c9d11
Former-commit-id: 6bbc851111461bca4aabeb7be09dfa13233066b8 [formerly 33f185d021
]
Former-commit-id: a4a5a1e94f
2013-03-12 16:43:13 -05:00
Nate Jensen
f4b80d4b15
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 48170212cb
[formerly 5e545cc9c4
] [formerly 863d4cf3df
] [formerly cbf0343d72
[formerly 863d4cf3df
[formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]]
Former-commit-id: cbf0343d72
Former-commit-id: 86f6a376c5bb355801995427243a8f6c4288aac8 [formerly b00ccd2b77
]
Former-commit-id: 35d0187e3d
2013-03-12 16:04:59 -05:00
Steve Harris
47cde9bd09
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 0cd7e56e65
[formerly 753a5213ab
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015
]
Former-commit-id: bca46a1354
2013-03-12 16:04:23 -05:00
Dave Hladky
eefd544e4b
Issue #1782 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 4b08491880
[formerly a1006667e0
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de
]
Former-commit-id: 155903d135
2013-03-12 15:48:34 -05:00
Dustin Johnson
2e6dbfe4ce
Merge "Issue #1778 Watch for bandwidth configuration changes" into development
...
Former-commit-id: f417e8fc5d
[formerly 13ce9b683d
] [formerly 11e7d3b511
] [formerly 6a0a04a519
[formerly 11e7d3b511
[formerly f33c6cbe9c63721ec62f57b3953abd48729c8674]]]
Former-commit-id: 6a0a04a519
Former-commit-id: 8e43f9dfa2a910c3efb59ec13bc67a05d282b421 [formerly 4ec51a98d9
]
Former-commit-id: f892ae71f7
2013-03-12 12:15:50 -05:00
Dustin Johnson
f3fb0e6fd2
Issue #1778 Watch for bandwidth configuration changes
...
Amend: Peer review comments
Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e
Former-commit-id: e358952f1f
[formerly 6eed493b3e
] [formerly 4c7f7801fa
] [formerly 794812fb23
[formerly 4c7f7801fa
[formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]]
Former-commit-id: 794812fb23
Former-commit-id: 4f7ac3d05b747da63a956d1add39e97eccb9f98f [formerly 33fe353252
]
Former-commit-id: d63cdbfd17
2013-03-12 12:02:09 -05:00
Lee Venable
5b34278877
Merge "Issue #1760 - fix minutes on the y axis of 3 hour graph" into development
...
Former-commit-id: ac7a1d3ea6
[formerly 1285a3d4af
] [formerly c4c8d74cad
] [formerly d68b5ac543
[formerly c4c8d74cad
[formerly 85970efae8002eb3f1773942211bd202014fecf2]]]
Former-commit-id: d68b5ac543
Former-commit-id: f7891989074b3e07fb1c34c466fb07b39f2a508d [formerly ed5ff858b4
]
Former-commit-id: 25449b6fe0
2013-03-12 11:33:17 -05:00
Mike Duff
7f42fb1818
Issue #1760 - fix minutes on the y axis of 3 hour graph
...
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69
Former-commit-id: f5d8ba8b0f
[formerly a6eea1874b
] [formerly b72c26b9e1b53b7b3a876aca712d2b063166889e [formerly 714de645d5
]] [formerly 7040daf472
[formerly 714de645d5
[formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]]
Former-commit-id: 7040daf472
Former-commit-id: 079adc9e9487fc0c7120ff74f0179911f122086a [formerly b5bccd0bb2
]
Former-commit-id: a712efa614
2013-03-12 11:25:05 -05:00
Mike Duff
143518e10b
Issue #1646 - Format the output
...
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6
Former-commit-id: 6f79d5e8f9
[formerly 75b6040ff6
] [formerly d1d694e1db
] [formerly ec0d814aa6
[formerly d1d694e1db
[formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]]
Former-commit-id: ec0d814aa6
Former-commit-id: d13b8b6dfbbd86c4ce3c55b81a092585ba5836e0 [formerly 7fbc376ec4
]
Former-commit-id: f1f79fc498
2013-03-12 10:42:13 -05:00