Commit graph

2502 commits

Author SHA1 Message Date
Nate Jensen
ad2b7df40b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]
Former-commit-id: 15fee953f5
2013-12-05 12:59:58 -06:00
Richard Peter
530b3bd588 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: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]
Former-commit-id: 60679a818a
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
6ebc4e5fbc Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly 9df4f83a0cf5042c67bf0eccc5635e37d1e149a8 [formerly f682e66e9b]] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]
Former-commit-id: fde968a834
2013-12-05 10:54:28 -06:00
Lee Venable
0a9dcb2cc4 Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly b7be687903 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec]
Former-commit-id: 40dc07e0ff
2013-12-05 08:30:28 -06:00
Lee Venable
35352350b7 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly a385ec612c [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]
Former-commit-id: a385ec612c
Former-commit-id: a8a45bbbf444fd2b11c872dd17abd893d3419ecd [formerly d433717c8c]
Former-commit-id: cddca699c6
2013-12-05 08:25:46 -06:00
Ron Anderson
fb3b7b0a9f Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]
Former-commit-id: e30d6041ee
2013-12-04 17:10:48 -06:00
Steve Harris
1e4b2bac7b 14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]
Former-commit-id: 4e6f319422
2013-12-04 16:47:59 -05:00
Ron Anderson
21f431f203 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]
Former-commit-id: a99197c5c2
2013-12-04 15:29:28 -06:00
Nate Jensen
3c8d882681 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9]
Former-commit-id: 331df460ff
2013-12-04 11:54:11 -06:00
Dave Hladky
085b6124b9 Issue #2607 Fixed Nullpointer
Former-commit-id: 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613]
Former-commit-id: c93d7b57a1
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
76c989a47d Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: a01200be83dcf0244764eae09c7c177e81901fa3 [formerly d1b4fdd9c8]
Former-commit-id: d6640590e9
2013-12-04 11:22:47 -06:00
Nate Jensen
f2a827f884 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly c29836abd7 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]
Former-commit-id: c29836abd7
Former-commit-id: 14135ca8d7f458242a1ad82bca5ddb70fc04057c [formerly bad9e2ab44]
Former-commit-id: cb3d6e2de3
2013-12-03 17:44:55 -06:00
Richard Peter
2cafd3a81b Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f6787c0b9f2cb0cae1c07a2111e91ecfc12f31f5 [formerly f5f75ec629]] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]
Former-commit-id: e82e1137f9
Former-commit-id: cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]
Former-commit-id: ee03dcf505
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
1e475d6b33 Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly eeb3b0173b [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]]
Former-commit-id: eeb3b0173b
Former-commit-id: cd3195def23d760eed1c4717d9bf0fee8c3ced2a [formerly dc4b8ec40f]
Former-commit-id: 641673e1d5
2013-12-03 13:00:47 -06:00
Nate Jensen
38c40514e6 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly 2daf0f2691 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]
Former-commit-id: 2daf0f2691
Former-commit-id: 7e05c5f491df89f47bf393e694a7be30c7d2023e [formerly a5cf904e1f]
Former-commit-id: b6e54e2709
2013-12-03 09:41:02 -06:00
Nate Jensen
d035dbc831 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: ccf897af6f [formerly 5c80b34e16] [formerly c0140fa0d91182080c96b83ad820144fcddbba66 [formerly 622cc1b223]] [formerly 90d6b5bd74 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: dd9050e05479911da92df93995a1c5e0aaf757e8 [formerly e40c71acd1]
Former-commit-id: e5cfe76cac
2013-12-02 17:28:09 -06:00
Steve Harris
b455a385e9 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]
Former-commit-id: 1195e95c8b
2013-12-02 16:17:38 -06:00
Steve Harris
41a54a5ca6 14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly bcc2fb56db7acfd2f7ecd928f118488dc7beb36e [formerly 70a6f1936e]] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]
Former-commit-id: 8bd818de09
2013-12-02 17:10:10 -05:00
Slav Korolev
4a2e195ea2 Issue #2387. Added system status refresh.
Former-commit-id: b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 7af8f0fd5e64f264ed562426f6db9723c7967a2d [formerly 5e225387fd]
Former-commit-id: 3dc318418e
2013-12-02 16:14:45 -05:00
Ben Steffensmeier
65147cfb78 Issue #2537 point data code cleanup.
Former-commit-id: 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: ad0bd85eb3b2bf617012e11ec19831b5f9d526eb [formerly 62ca7b1df6]
Former-commit-id: a4e3bf34b8
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
56456894f1 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: dcfdc9a24b [formerly 8a7d3ceab1] [formerly 192772b92c8a86ee4d2a06670357a91aa3f822cd [formerly 927801985a]] [formerly 3696896b49 [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5]
Former-commit-id: ca5e771451
2013-11-25 11:31:57 -06:00
Richard Peter
26eb16cae1 Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: 551ccf368d [formerly 4b09affc7c] [formerly b26e562845] [formerly be7c2ef08e [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]
Former-commit-id: be7c2ef08e
Former-commit-id: b4dd124c6256f5d1be94fb46c9a4a162c713aed8 [formerly c51cc4bf17]
Former-commit-id: d1201473cd
2013-11-22 12:38:05 -06:00
Nate Jensen
873a26a6a7 Merge "Issue #2361 fix style manager's jaxb context" into development
Former-commit-id: 591dcce82e [formerly 38fdf1edcf] [formerly 9de7c7f434] [formerly 49ce4d4be3 [formerly 9de7c7f434 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 562f912e8920c73d85c6d405361ce0180caa8daf [formerly 6ab6de4419]
Former-commit-id: e049c8aca2
2013-11-22 10:08:13 -06:00
Nate Jensen
bf3e9e95e6 Issue #2361 fix style manager's jaxb context
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 905879ba90 [formerly 2c61b8f4d6] [formerly 16329ab06b] [formerly 328991e577 [formerly 16329ab06b [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]
Former-commit-id: 328991e577
Former-commit-id: 3170492ca14e7028f5daf3a156117f991ebeea59 [formerly ebc3efdf80]
Former-commit-id: 24e99ec924
2013-11-22 09:15:24 -06:00
Dave Hladky
ad8acfb5f4 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: 162dcb3f42 [formerly 233238d8df] [formerly 04c7e2cffc] [formerly a9a3973319 [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: 72c3d32a8a4aa43ecf8d033ca096d32cb261c568 [formerly ebd6d5cbe1]
Former-commit-id: cebf79ad44
2013-11-21 14:46:47 -06:00
Nate Jensen
a95890a5c8 Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
Former-commit-id: 9c2398a7dd [formerly 32cbfd6150] [formerly ddb0eaf0ff] [formerly d851e6fc97 [formerly ddb0eaf0ff [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]
Former-commit-id: d851e6fc97
Former-commit-id: c5557070349346f520ff88e345376e2ce126e8b0 [formerly f60948fc36]
Former-commit-id: f5a2c7298a
2013-11-21 10:12:11 -06:00
Nate Jensen
68ac9daf67 Issue #2033 fix plots working with multiple plotModels dirs contributed
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: 8a2c4ced39 [formerly b3028b4f39] [formerly 9371c63c41] [formerly 2b6799712d [formerly 9371c63c41 [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]
Former-commit-id: 2b6799712d
Former-commit-id: 6e959cad50fac90ee22febf459ef923945938143 [formerly 3e88de72dc]
Former-commit-id: 87dc5fb261
2013-11-20 17:33:53 -06:00
Ron Anderson
bbb24dfdbd Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224

Former-commit-id: a83d214f40 [formerly 7a3c7d530e] [formerly d72119409e] [formerly 633137d8c0 [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]
Former-commit-id: 633137d8c0
Former-commit-id: ebfd4c9fd692514b821af5e75fe51a87a50ddecc [formerly f6b9e69738]
Former-commit-id: 769df41dea
2013-11-20 13:43:25 -06:00
Ben Steffensmeier
7d6d765081 Issue #2532 Fix grid displays of grids larger than the world.
Former-commit-id: f98ccd8c97 [formerly 6d878e3361] [formerly d3ed1ba356] [formerly 41753c40b5 [formerly d3ed1ba356 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]]
Former-commit-id: 41753c40b5
Former-commit-id: c329e9c74d28818f4e37e2c7f57e4357d5175a4a [formerly 07743c4369]
Former-commit-id: 7f441392b8
2013-11-20 11:11:03 -06:00
Brian Clements
6c28068d21 Issue #2393 removed pypies interpolation
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: 42f7214967 [formerly d35fc591d2] [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88]
Former-commit-id: 10e63616ff
2013-11-20 08:40:12 -06:00
Steve Harris
2c49ed51ac 14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]
Former-commit-id: e35ec60f7e
2013-11-19 16:40:25 -05:00
Lee Venable
1468a92082 Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: 389f8c5e13 [formerly b6321334e6] [formerly f8f0a0e41e] [formerly d42c36f365 [formerly f8f0a0e41e [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]
Former-commit-id: d42c36f365
Former-commit-id: 84cbbb40a445a2c0f18f57bc065371cfaef10f48 [formerly da5cfb3d8e]
Former-commit-id: c680cc3ea9
2013-11-19 15:12:38 -06:00
Nate Jensen
37f4ecfe9e Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: 87a792417c [formerly f7034f933e] [formerly c6d6b07e3f] [formerly a610825ef9 [formerly c6d6b07e3f [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]
Former-commit-id: a610825ef9
Former-commit-id: 4beedd31ac277b5c01f8da9cd36f06a6acf40875 [formerly 04de350ae7]
Former-commit-id: 789f050b27
2013-11-19 14:11:01 -06:00
Nate Jensen
cee86da089 Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: cd44881c08 [formerly 83c28fd04b] [formerly f0d6be27f5ee82f002ddbe68846abd862e00dee1 [formerly c90a7d7b3c]] [formerly 5aee685557 [formerly c90a7d7b3c [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]
Former-commit-id: 5aee685557
Former-commit-id: 28a62e8d27dd2659e289060d6d67eda25d130e3e [formerly e9adf706ba]
Former-commit-id: 48632a81b3
2013-11-19 12:59:10 -06:00
Mike Duff
4d18da0420 Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: 31964ce934 [formerly c7c20c6ce8] [formerly ed73a7e55a] [formerly 71093a685e [formerly ed73a7e55a [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]
Former-commit-id: 71093a685e
Former-commit-id: 12ad71e7abd9db2b712a0ed6f4e8a8e81bf4cc49 [formerly 437df90354]
Former-commit-id: 8f9b847eff
2013-11-19 12:51:06 -06:00
Mike Duff
fd5a8b283d Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: 7048853fd2 [formerly f8d5563973] [formerly c908647259] [formerly 665d9e7651 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]
Former-commit-id: 665d9e7651
Former-commit-id: fa1699e3e40e15a4fba251ecf2b68f464c00c042 [formerly 5afa90b967]
Former-commit-id: 8221f50e8a
2013-11-19 08:55:27 -06:00
Nate Jensen
32737415fc Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: 629d611145 [formerly accbd46ad6] [formerly edf51dffc9] [formerly 3d51d80170 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]]
Former-commit-id: 3d51d80170
Former-commit-id: d7ac7a454945a6f649dfab52f167467ddb507d1e [formerly f07f543cd3]
Former-commit-id: 7da95f7b57
2013-11-18 12:50:38 -06:00
Nate Jensen
f640ecf96e Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: b64c20e99c [formerly 493cdb287c] [formerly 0dbe79344a] [formerly 827b7f5a93 [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]
Former-commit-id: 827b7f5a93
Former-commit-id: ab02400e12a733ec9507e8ac73837821fa31df90 [formerly 6900d4e47f]
Former-commit-id: 3de7e3576b
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
8e2b4353cc Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 830a28498b [formerly 6b6c46afa8] [formerly 105e3e359a] [formerly e7a068e595 [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]
Former-commit-id: e7a068e595
Former-commit-id: ae49586b08f646c42f059223597489c739f0cdce [formerly e605758e57]
Former-commit-id: 51c04680e2
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
00088654a0 Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: 0a3d78555e [formerly 15ae95075d] [formerly e392185d78] [formerly 9ff1751f4e [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695]
Former-commit-id: 0788a82a99
2013-11-18 11:44:56 -06:00
Nate Jensen
f9cdff25f0 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 0146ae59df [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3]
Former-commit-id: d9d0eb7354
2013-11-18 11:39:12 -06:00
Steve Harris
3b074763ab Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]
Former-commit-id: 3f9df61017
2013-11-15 13:15:25 -06:00
Steve Harris
7977f24d77 14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]
Former-commit-id: eab5bb1147
2013-11-15 12:47:49 -05:00
Nate Jensen
d8f4ecc2d7 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761]
Former-commit-id: d0d712ec6f
2013-11-14 17:41:24 -06:00
Mike Duff
bc96849913 Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 24dc37f03b [formerly 0d83797a4e] [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]
Former-commit-id: 95fda38cc5
Former-commit-id: 041b2afc87e9fd510c3e653e8424f02271121cc3 [formerly 7be43c4a52]
Former-commit-id: a13aa64b65
2013-11-14 17:30:55 -06:00
Richard Peter
586b11c80d Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b]
Former-commit-id: 65e8ad1a62
2013-11-14 17:21:48 -06:00
Brian Clements
7625e0ef16 Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: e8c8314abe [formerly 55682480e1] [formerly a741cec01e3c674aef92a9cc8641d62be829d023 [formerly cacdf313c5]] [formerly 00490c2db2 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23]
Former-commit-id: 878a677d18
2013-11-14 17:12:02 -06:00
Mike Duff
0f848918e8 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 47a0477587 [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02]
Former-commit-id: 44cc3d8776
2013-11-14 17:07:54 -06:00
Nate Jensen
31392685aa Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: 2d5752d3d6 [formerly 3b11ea8c5b] [formerly b4bcd14a85] [formerly c2aacfc437 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]
Former-commit-id: c2aacfc437
Former-commit-id: dcba58ed57cf3e8859d8471e47fda78c0e7ef984 [formerly a8a1e396fe]
Former-commit-id: f0a0287230
2013-11-14 16:34:28 -06:00
Richard Peter
b9da33bcea Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]
Former-commit-id: c42f931118
Former-commit-id: d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31]
Former-commit-id: e5dc8e2027
2013-11-14 14:56:59 -06:00