brian.dyke
2294c81a57
merge 14.2.1-3 into asm-14.2.2
...
Former-commit-id: a116be206fc8a24dd12610db37db6f26c65a19b0
2014-01-27 15:27:49 -05:00
Ron Anderson
ba7a25a88f
Merge branch 'master_14.1.1' into solutions
...
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 9f121ec921a2f8635c48f005ddb71787ad6bf166
2014-01-13 17:45:20 -06:00
Steve Harris
8bbd803ace
14.1.1-15 baseline
...
Former-commit-id: cb8eca2a0dfc0e2348301e8d9932db824ecaf34c
2014-01-06 14:08:08 -05:00
Steve Harris
f2ad9da4eb
14.1.1-14 baseline
...
Former-commit-id: 46bdb43889bdc681fec2aba45004a1583caaa6ae
2014-01-06 14:02:30 -05:00
Matthew Howard
f0ad72ba4c
Merge "Issue #234 " into master_14.2.1
...
Former-commit-id: 6ac3184c14137a45396eb1b45ed7c6ce4a291b3a
2013-12-24 11:41:42 -05:00
Juliya Dynina
6b5e8c49d9
Merge "Issue #117 " into master_14.2.1
...
Former-commit-id: 46a6facdf2894434c0787bd9f4b9f9e1cb7cc35f
2013-12-23 09:18:36 -05:00
Juliya Dynina
b83c80c046
Merge "Issue #117 " into master_14.2.1
...
Former-commit-id: ff8dcb6aface85849c91bc81f862ea4c382da19d
2013-12-23 09:18:22 -05:00
Qinglu.Lin
6e1dd369a8
Issue #117
...
Change-Id: I83e97c43ab9c27a965a9329d5cc4d691c7e20dc2
Former-commit-id: c877d3db7b960309def150343672757b59b353a3
2013-12-20 14:31:16 -05:00
Qinglu.Lin
db66cbb605
Issue #117
...
Change-Id: I52293e2148fdc1fbfd22ad01e03d6d628cd1c09a
Former-commit-id: 6f197a78afa6a8760f852e94861950a230eaedcc
2013-12-20 14:21:54 -05:00
Gang.Zhang
5f87120aba
Issue #234
...
Change-Id: If943dfd5a9c39c57301e8636c1af62d8eaaad4af
Former-commit-id: 1c0633daccad7e9f20b444c86fa15fa11cadd0e7
2013-12-20 16:00:44 +00:00
Kiran Shrestha
e2fffcc3bb
Issue #91
...
Change-Id: I9a6d24e5a186432479cb763ebcf1ad5ba292283e
Former-commit-id: 7eef26abf692a4ebbadfdc873df21f305f31bc19
2013-12-18 19:49:13 +00:00
Richard Peter
1de516964b
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9
2013-12-17 21:04:53 -06:00
Nate Jensen
66f5000243
Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
...
Former-commit-id: 69cbbcc3c88565c35c1453412f031669306adf0f
2013-12-17 12:20:37 -06:00
Brad Gonzales
cc75442fa3
Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
...
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods. Wrapped debug logging in is debug on checks.
Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90
Former-commit-id: 3db5d79b914436b8d0feed600fc586d7d3884706
2013-12-17 11:57:06 -06:00
Brad Gonzales
d324400d65
Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
...
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168
Former-commit-id: f4c1739687685a22847a09490724e84825032146
2013-12-17 09:43:12 -06:00
Bryan Kowal
43008f4698
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
...
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: 71f74d7b8125994537ef5520fe59134a7f86e9af
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
7e5349bbff
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
...
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: 33033c354a783ab58d89599eb78355c6b354594f
2013-12-16 14:31:44 -06:00
Richard Peter
3758a9532c
Merge "Issue #2170 : Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
...
Former-commit-id: 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f
2013-12-16 13:43:37 -06:00
Richard Peter
35299e917d
Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
...
Former-commit-id: b21de50d989fa341b99c0632e908c6c1f7b6853f
2013-12-13 16:09:13 -06:00
Mike Duff
b310cf0388
Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
...
Former-commit-id: f68aaea220b8ad7dcc886bb3bdeab362b977061e
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
70e6212353
Issue #2613 Replication subscription start time correctly set
...
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5
Former-commit-id: 6f3bc8a63cbd5480d65875815de4cdffa63c266c
2013-12-13 14:17:11 -06:00
Richard Peter
595a655dfd
Issue #2170 : Fix PluginNotifier direct-vm endpoints
...
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c
Former-commit-id: b9415039acdc85ee7975e9d6bd27047cce623723
2013-12-13 12:32:46 -06:00
Steve Harris
c88b10039a
14.1.1-13 baseline
...
Former-commit-id: 6eef3022653638f9031a85932d8d551aba5600d2
2013-12-12 16:59:57 -05:00
Richard Peter
312fcc2b2f
Issue #2170 : Add registration of Router to Notification Framework
...
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad
Former-commit-id: 6ea46281b904c99c9b6c9f364293bec96be16f7d
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
399c579671
Issue #2619 Fix rare dateline bug.
...
Former-commit-id: 8231fde4fdcb25ad19e31dd8e4f5716becba347c
2013-12-12 10:30:22 -06:00
Richard Peter
ffab0f1669
Merge "Issue #2613 Fixed build" into omaha_14.2.1
...
Former-commit-id: c1630accf918363334c4d558cda8810341d0a2b7
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
7529f5bbe8
Issue #2613 Fixed build
...
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14
Former-commit-id: ce2bffa120b722cb3337658584a83c5161f07a51
2013-12-12 09:44:05 -06:00
Richard Peter
91dc7825ce
Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
...
Former-commit-id: 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d
2013-12-11 18:00:10 -06:00
Richard Peter
49def8a4b2
Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
...
Former-commit-id: 4da283cae33cca8264007e246fa3d02b9809a114
2013-12-11 17:59:43 -06:00
Brad Gonzales
112649eff2
Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
...
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c
Former-commit-id: 14171c13dd5f127df0b90a5db9a9e11b301ffc5f
2013-12-11 17:06:41 -06:00
Richard Peter
63bd2b26eb
Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
...
Former-commit-id: 3d887a288459b786718a59d0c4a368408c3419f0
2013-12-11 16:19:02 -06:00
Richard Peter
375c532376
Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
...
Former-commit-id: 6a3b2d31829b4f6d39a6a06ec06c901b58506deb
2013-12-11 16:11:26 -06:00
Richard Peter
d9d19a1515
Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
...
Former-commit-id: 4ea822a22d2b21b4b3172a1f93773f01c2af20de
2013-12-11 16:08:06 -06:00
shooper
310a5f238f
Issue #219
...
Change-Id: I77aae849959a7629ec8128536d570a3f21bc5eb3
Former-commit-id: f03684d97044a5eb53e954236fb90669f70ec174
2013-12-11 16:25:33 -05:00
Mike Duff
9a02ae7d68
Issue #2616 - Set overwrite allowed flag on madis records when decoded
...
Added delta script for table MADIS with the hibernate generated key name
Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519
Former-commit-id: b3a18fd5270f2ce109b0560fba6e11e76e721bc9
2013-12-11 14:12:05 -06:00
Benjamin Phillippe
969099d4c4
Issue #2613 Registry performance enhancements
...
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21
Former-commit-id: 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d
2013-12-11 12:20:12 -06:00
Mike Duff
d378d9194a
Issue #2625 - fix no data errors in bandwidth utilization graph
...
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime
Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7
Former-commit-id: 9e37fa3a052d49830b36e6187280615cb6517d47
2013-12-11 11:29:38 -06:00
Brad Gonzales
5dd466e22a
Issue #2566 fix bandwidthmanager spring file resource resolution.
...
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731
Former-commit-id: c12676830e66cf8e18f10e835c0f95e25074d992
2013-12-11 11:19:40 -06:00
Nate Jensen
fa674baf89
Issue #2581 remove LSR dataURI column
...
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f
Former-commit-id: 88124207249673c3bf29915b6f6318bd2397ecd5
2013-12-10 18:27:33 -06:00
Nate Jensen
60d395b347
Issue #2581 fix decoding of LSR freezing drizzle and latlon
...
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5
Former-commit-id: f7324d1e9ab164c553f5c62920292fb0487bfcfb
2013-12-10 10:10:11 -06:00
Richard Peter
b3f90b4e07
Issue #2170 : Fix Ensemble notifications
...
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b
Former-commit-id: da7c2ba0cdc0e9108d987d9ff7531f657c7c832e
2013-12-06 15:41:10 -06:00
Brad Gonzales
410a00c72a
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
...
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4
2013-12-05 15:17:14 -06:00
Richard Peter
d0b50eee3c
Merge "Issue #2545 - Get bandwidth graph data by network" into development
...
Former-commit-id: a31695805478d27e072d069d5d3b369001c1d80d
2013-12-05 14:54:46 -06:00
Richard Peter
5286ef0efa
Issue #2509 : Fix bad merge of DupElimSrv
...
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322
Former-commit-id: a266d4007bdb58525942ef406d6fd7a4d269bb8c
2013-12-05 14:22:25 -06:00
Mike Duff
4796f43495
Issue #2545 - Get bandwidth graph data by network
...
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314
Former-commit-id: 9102f16c8a6409e92ded498b82a6a4e6a531f2c0
2013-12-05 13:35:31 -06:00
Richard Peter
bacfa33301
Merge "Issue #1829 Refactored EBXML registry objects" into development
...
Former-commit-id: 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9
2013-12-05 13:01:02 -06:00
Nate Jensen
34205de815
Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
...
Former-commit-id: 18437fb36f9fff510f526ba40b52c4ec4793e18b
2013-12-05 13:00:06 -06:00
Nate Jensen
c47f6546dd
Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
...
Former-commit-id: 648e5bff2e85d00cf5bcee923f2a137aa76117fc
2013-12-05 12:59:58 -06:00
Richard Peter
73960ce29a
Issue #2509 : Fix IFPWE merge issue
...
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75
Former-commit-id: 9450ca459d6b2efdea0d0124a6f9e7100eb5472a
2013-12-05 12:33:51 -06:00
Richard Peter
0c4ae068ad
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
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/smartinit/IFPWE.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/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b09f1559254f06a82afa91f0cc14c8150f88ce64
2013-12-05 12:12:27 -06:00
