xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4745 commits 31 branches 40 tags 3.8 GiB
Commit graph

2210 commits

Author SHA1 Message Date
Brian.Dyke
b6e4e23394 Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]
Former-commit-id: 8c2f601b59
Former-commit-id: 73be1016c0
 2014-04-10 13:26:42 -04:00
Richard Peter
efd1003a50 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
 2014-04-09 16:00:54 -05:00
Brian.Dyke
7de936dfba Merged 1354 -7 and -8 into 1412 
Former-commit-id: 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]
Former-commit-id: 947194c998
Former-commit-id: e4136f79dd
 2014-04-09 11:39:07 -04:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
 2014-04-04 12:57:32 -04:00
Richard Peter
9536a08425 Issue #2509: Fix stitched grid notifications 
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4

Former-commit-id: f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]
Former-commit-id: 53d5000261
Former-commit-id: bfba75f73f
 2014-04-01 14:44:05 -05:00
David Gillingham
d14aee89aa Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1. 
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]
Former-commit-id: a529bc8cad
Former-commit-id: 402adfeddb
 2014-03-31 15:49:33 -05:00
Brian.Dyke
7ca114f7f1 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]
Former-commit-id: 6346c9776b
Former-commit-id: a1b980a15d
 2014-03-27 10:22:26 -04:00
Steve Harris
e621e81f20 Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1 
Former-commit-id: a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]
Former-commit-id: 4879520391
Former-commit-id: 9cf3600ff6
 2014-03-26 15:51:32 -05:00
Richard Peter
d4c67a0f8c Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1 
Former-commit-id: 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]
Former-commit-id: 390e73af44
Former-commit-id: 6236137635
 2014-03-24 09:53:13 -05:00
Dave Hladky
912c7e2d12 Issue #2939 Madis data mismatches 
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]
Former-commit-id: 3ac04dd071
Former-commit-id: 39343e1801
 2014-03-24 08:27:12 -05:00
Mike Duff
d7d06e18fd Issue #2941 - Sort data before returning 
Former-commit-id: 4db73e42a5 [formerly 73a011b940 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]
Former-commit-id: 73a011b940
Former-commit-id: ff07b90659
 2014-03-24 08:19:21 -05:00
Brian.Dyke
674036b172 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]
Former-commit-id: 06ee9a6384
Former-commit-id: 50e5f4f78d
 2014-03-24 07:01:29 -04:00
Brian.Dyke
8366e88db1 OB_14.1.1-24 baseline 
Former-commit-id: face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]
Former-commit-id: 37b6368268
Former-commit-id: 37e9d48d45
 2014-03-21 12:43:50 -04:00
Brian.Dyke
e85e3c2e70 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]
Former-commit-id: d23acbdd48
Former-commit-id: 9f332e938c
 2014-03-14 11:13:30 -04:00
Brian.Dyke
a68bda6858 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]
Former-commit-id: d4b6d22ae2
Former-commit-id: 4e3096631d
 2014-03-14 08:44:39 -04:00
Brian.Dyke
b24e7a66d8 OB_14.1.1-23 baseline 
Former-commit-id: bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]
Former-commit-id: dcc2e4fd61
Former-commit-id: 55918ee421
 2014-03-14 08:18:16 -04:00
Ben Steffensmeier
eb922ea2e2 Issue #2528 Fix satellite units/style. 
Former-commit-id: 75120a09cd [formerly 77041e5b17 [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]
Former-commit-id: 77041e5b17
Former-commit-id: e6cd8b3167
 2014-03-12 14:19:49 -05:00
Richard Peter
4d5c7e49f9 Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1 
Former-commit-id: f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]
Former-commit-id: 18234c5d73
Former-commit-id: e981ce3e36
 2014-03-11 16:43:37 -05:00
Dave Hladky
b440063bb9 Issue #2678 end retrieval double clutching 
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]
Former-commit-id: 3500ad262a
Former-commit-id: 7cd4304140
 2014-03-11 15:53:59 -05:00
David Gillingham
751d8956a9 Issue #2509: Fix static topo generation break caused by baseline merge. 
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]
Former-commit-id: b0783b64ce
Former-commit-id: e3a3cf7bad
 2014-03-11 11:54:25 -05:00
Juliya Dynina
2b55a4240e Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1 
Former-commit-id: 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]
Former-commit-id: 6bbd88e62c
Former-commit-id: b3ec4c363f
 2014-03-11 09:24:12 -05:00
brian.dyke
730491d4bb Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]
Former-commit-id: 654778bb0d
Former-commit-id: 1a482f91bc
 2014-03-10 15:36:56 -04:00
Steve Harris
da2d7fc334 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]
Former-commit-id: 92232fa063
Former-commit-id: 068297b90a
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
bd02f6a1a6 ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: 56a949fba8 [formerly 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]
Former-commit-id: 41a4905f9f
Former-commit-id: e894b1279a
 2014-03-07 14:53:54 -05:00
David Friedman
b8aadf1781 ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]
Former-commit-id: 2c1a3442d6
Former-commit-id: 103fece7b7
 2014-03-07 14:58:09 +00:00
Steve Harris
52226061e9 Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
 2014-03-06 08:39:43 -06:00
Benjamin Phillippe
7ad21da089 Issue #2769: Added batching to registry sync 
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 9fd35140f0 [formerly 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]]
Former-commit-id: 59323be87e
Former-commit-id: 7bf51d507e
 2014-03-04 13:31:41 -06:00
Richard Peter
2b5339e16f Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1 
Former-commit-id: f9bd27c061 [formerly aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]
Former-commit-id: aa8e1a3625
Former-commit-id: 5280398130
 2014-03-04 12:54:23 -06:00
Nate Jensen
645fec513a Issue #2813 fix subscription package names 
Former-commit-id: d7d0803ee9 [formerly 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]
Former-commit-id: 0ec866f1d2
Former-commit-id: af76b58b27
 2014-03-04 10:53:58 -06:00
Brian.Dyke
5179a4f970 OB_14.1.1-21 baseline 
Former-commit-id: 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]
Former-commit-id: 1d92e5bab6
Former-commit-id: 271ec85c0c
 2014-03-04 11:47:42 -05:00
Benjamin Phillippe
ea31c5b370 Issue #2769: Registry database deadlocking fixes/performance improvements 
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]
Former-commit-id: ed050996a2
Former-commit-id: d339e232f4
 2014-03-03 10:57:16 -06:00
Brian.Dyke
2613e13e08 OB_14.1.1-20 baseline 
Former-commit-id: 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 324696c436
Former-commit-id: b2401d2f0d
 2014-02-26 17:39:15 -05:00
Richard Peter
2c433bb05c Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1 
Former-commit-id: b4e48698ed [formerly 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]
Former-commit-id: 3735cd3ffe
Former-commit-id: 90b48e0393
 2014-02-25 12:34:38 -06:00
Brad Gonzales
39afe190e0 Issue #2386 fixed spatial overlap rule application. 
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]
Former-commit-id: 783afb1585
Former-commit-id: b6e2ce4b74
 2014-02-25 09:22:08 -06:00
Brian.Dyke
9158806dd2 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7 
Former-commit-id: 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 2faab606e5
Former-commit-id: 363403fb34
 2014-02-24 14:51:00 -05:00
Ron Anderson
049424e5f0 Merge branch 'master_14.2.1' into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]
Former-commit-id: 4364e7497c
Former-commit-id: 45ccac0859
 2014-02-24 13:46:48 -06:00
Nate Jensen
4af8a7f326 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1 
Former-commit-id: b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]
Former-commit-id: 2111109ce2
Former-commit-id: 98a6101cd3
 2014-02-24 13:25:35 -06:00
Dave Hladky
d31708962b Issue #2469 Fixed default rules implementation 
Former-commit-id: 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]
Former-commit-id: 1d256bfcee
Former-commit-id: f9c6a396f0
 2014-02-24 13:06:52 -06:00
Ben Steffensmeier
669b580920 Issue #2762 Use UCUM to format units so IRPixel formats correctly. 
Former-commit-id: f8cc0e3d95 [formerly 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]
Former-commit-id: 9e5f7d90a0
Former-commit-id: f7c48b24bb
 2014-02-24 10:27:30 -06:00
Dave Hladky
cd7934e12f Issue #2636 Try Catch around the MaintTask 
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]
Former-commit-id: c4bed432da
Former-commit-id: 542ba7e504
 2014-02-21 16:01:20 -06:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline 
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
 2014-02-21 06:50:59 -05:00
David Gillingham
43733c77eb Issue #2783: Rewrite run_report_alarm script into EDEX service. 
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]
Former-commit-id: 32719432ff
Former-commit-id: 607ce13c19
 2014-02-18 13:24:37 -06:00
Richard Peter
4dcb9b321d Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1 
Former-commit-id: d19e464a1a [formerly 3ed6ad64ce [formerly 5bf461753675af961c484d022cec4006fabfeba8]]
Former-commit-id: 3ed6ad64ce
Former-commit-id: c666adb530
 2014-02-18 12:44:57 -06:00
Lee Venable
f81d0d88b8 Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1 
Former-commit-id: 4e7c3c0cbe [formerly 0cf2dba731 [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]
Former-commit-id: 0cf2dba731
Former-commit-id: e9226e7140
 2014-02-18 12:19:41 -06:00
Brad Gonzales
b0f71efecc Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues. 
Amend: updated test envlope sizes.
       fixed ticket numbers in software history.

Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5

Former-commit-id: 794bbc3c9b [formerly 36a24c1cb5 [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]
Former-commit-id: 36a24c1cb5
Former-commit-id: 49ddffc99b
 2014-02-18 12:11:02 -06:00
Mike Duff
c125b9d044 Issue #2636 - Change how retrieval plan is updated over time. 
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 911789b910 [formerly 89bd047283 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]
Former-commit-id: 89bd047283
Former-commit-id: 33f81d8822
 2014-02-18 12:05:26 -06:00
Brad Gonzales
1d57e9f5f7 Issue #2771 For Data Delivery CAVE now request current id from 
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]
Former-commit-id: 19460ed0d7
Former-commit-id: 379c0fb46c
 2014-02-18 11:10:44 -06:00
Ron Anderson
410f956cff Merge branch 'master_14.1.1' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 32bcf9d0d0
Former-commit-id: e7f2b6883d
 2014-02-18 10:45:20 -06:00
Dave Hladky
c8711269fa Issue #2786 Pending subscriptions don't work. 
Former-commit-id: 7ee101d7c7 [formerly 5c11dd09bb [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]
Former-commit-id: 5c11dd09bb
Former-commit-id: 24a4fab603
 2014-02-18 09:14:38 -06:00
Nate Jensen
e42eb1940d Issue #2813 fix xml serialization of subscriptions 
Former-commit-id: 83e9226419 [formerly be75cc3731 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]
Former-commit-id: be75cc3731
Former-commit-id: 4583814741
 2014-02-17 11:37:48 -06:00