Commit graph

4313 commits

Author SHA1 Message Date
Nate Jensen
64318dcc88 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 0146ae59df [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]]
Former-commit-id: 0146ae59df
Former-commit-id: f9cdff25f0 [formerly d9d0eb7354] [formerly d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3]]
Former-commit-id: 6f1ac0cbf7524da75f1cd4b4998b7cdb7a08bd26 [formerly 951c1ff2f3]
Former-commit-id: 7e76b097c7
2013-11-18 11:39:12 -06:00
Steve Harris
2d3311aace 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 f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab [formerly 3f9df61017] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6]
Former-commit-id: 87ce579deb
2013-11-15 13:15:25 -06:00
Steve Harris
1c4b82577c Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)

Former-commit-id: 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: b1d82b9c2c [formerly 156395b85b] [formerly 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1]]
Former-commit-id: 29c5be7d12e460b8d18f00420279fd45027d33c8 [formerly 7127a1e665]
Former-commit-id: c4e9fe1c94
2013-11-15 13:05:40 -06:00
Steve Harris
e3de9e104e 14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77 [formerly eab5bb1147] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5]
Former-commit-id: ed58bc7f71
2013-11-15 12:47:49 -05:00
Brad Gonzales
d72d725ba7 Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
Added missing comma to com.raytheon.edex.plugin.text.

Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162

Former-commit-id: 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 66a8a30092 [formerly 4ec5ee7f74] [formerly e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010]]
Former-commit-id: e7ce2920a68b4911c5e309cad65b7a703bffe97b [formerly 4499a8d1de]
Former-commit-id: 2c7e62ee89
2013-11-15 08:00:47 -06:00
Nate Jensen
6b09f38258 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

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

Former-commit-id: 24dc37f03b [formerly 0d83797a4e] [formerly 414cb1cf68] [formerly 24dc37f03b [formerly 0d83797a4e] [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]]
Former-commit-id: 95fda38cc5
Former-commit-id: bc96849913 [formerly a13aa64b65] [formerly 041b2afc87e9fd510c3e653e8424f02271121cc3 [formerly 7be43c4a52]]
Former-commit-id: 975d2f3e3965fd819361ea85039cd6dd56556377 [formerly 0f2626f79f]
Former-commit-id: 44c4259ccc
2013-11-14 17:30:55 -06:00
Richard Peter
448c6c570e Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 586b11c80d [formerly 65e8ad1a62] [formerly 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b]]
Former-commit-id: 267888101d1e70c5ebb253bbe68dc00463f279b2 [formerly 38d2c6564a]
Former-commit-id: 8247da7774
2013-11-14 17:21:48 -06:00
Brian Clements
241564343a 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 cacdf313c5] [formerly e8c8314abe [formerly 55682480e1] [formerly cacdf313c5] [formerly 00490c2db2 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]]
Former-commit-id: 00490c2db2
Former-commit-id: 7625e0ef16 [formerly 878a677d18] [formerly 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23]]
Former-commit-id: 8e8a6bfd8a34aa6c97d6d0ea6b0fad6ad98a7ebf [formerly e7c355df52]
Former-commit-id: 1a2b934e97
2013-11-14 17:12:02 -06:00
Mike Duff
0e3d39d133 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 47a0477587 [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]]
Former-commit-id: 47a0477587
Former-commit-id: 0f848918e8 [formerly 44cc3d8776] [formerly 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02]]
Former-commit-id: 0ff9a554b33df76684f00b9934e1c4b55b0cb9f6 [formerly 5fdf101af6]
Former-commit-id: 769e81cd23
2013-11-14 17:07:54 -06:00
Nate Jensen
da110c93cc Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: 2d5752d3d6 [formerly 3b11ea8c5b] [formerly b4bcd14a85] [formerly 2d5752d3d6 [formerly 3b11ea8c5b] [formerly b4bcd14a85] [formerly c2aacfc437 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]]
Former-commit-id: c2aacfc437
Former-commit-id: 31392685aa [formerly f0a0287230] [formerly dcba58ed57cf3e8859d8471e47fda78c0e7ef984 [formerly a8a1e396fe]]
Former-commit-id: 92e37cdfb10a78fc44861b3461fac1e50f9a0b14 [formerly 7ec18ba0b1]
Former-commit-id: f6abd529f7
2013-11-14 16:34:28 -06:00
Richard Peter
170aeb49af Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]]
Former-commit-id: c42f931118
Former-commit-id: b9da33bcea [formerly e5dc8e2027] [formerly d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31]]
Former-commit-id: 6bd09bf526063f854e453bf474886432548c3c50 [formerly e7d8e5e560]
Former-commit-id: 2025e073ef
2013-11-14 14:56:59 -06:00
Lee Venable
71f7f7f52f Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: 2f134e6aa3 [formerly bd81ec8807] [formerly 834c2ac8da] [formerly 2f134e6aa3 [formerly bd81ec8807] [formerly 834c2ac8da] [formerly f0ebee3bb3 [formerly 834c2ac8da [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 0e326c2a12 [formerly e9b8ee42c7] [formerly a74585351b2263565cb70d9d704cba8fb765886e [formerly 7d04b2e4ce]]
Former-commit-id: 649ceeb15e5073f34a435cdd6eb59756c9c5ec8a [formerly ad77be1b44]
Former-commit-id: 194a6760b7
2013-11-14 14:43:18 -06:00
Mike Duff
b4eaa45753 Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: c3aee76403 [formerly f6c4ca2bc0] [formerly 87a4b1bec4] [formerly c3aee76403 [formerly f6c4ca2bc0] [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]]
Former-commit-id: a80964bc7c
Former-commit-id: b27ee6803f [formerly 48093514a6] [formerly 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42]]
Former-commit-id: 1f88021dcffff2375d1ca1a6dd6252ce277c8f2c [formerly cf077ed7f9]
Former-commit-id: 2b91b4b9ef
2013-11-14 14:40:33 -06:00
Richard Peter
d289419c40 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
2013-11-14 14:40:23 -06:00
Lee Venable
686d984163 Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly bc7f5e556d [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]]
Former-commit-id: bc7f5e556d
Former-commit-id: b93b05165c [formerly 69934b9b32] [formerly 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc]]
Former-commit-id: b05b8692e13600b879c8d4c9de8f0c9322ffe832 [formerly 84de0beae4]
Former-commit-id: ab512eaeb1
2013-11-14 14:33:18 -06:00
Richard Peter
24e58ea252 Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: df3e6735af [formerly 6af248f212] [formerly 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c]]
Former-commit-id: 90ff75232070f6fc3d10b664951a96a9876cc88b [formerly ace2a71092]
Former-commit-id: 7375a3b961
2013-11-14 13:30:09 -06:00
Nate Jensen
493fa54860 Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: 9517c96d68 [formerly a4eb19fc79] [formerly 9acda0b9f2] [formerly 9517c96d68 [formerly a4eb19fc79] [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]]
Former-commit-id: c5cf68cc45
Former-commit-id: ddcca3463d [formerly e41f57da67] [formerly a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69]]
Former-commit-id: 6f2e3001c41627a8a93fc22d02074369aa136e2d [formerly e83a828209]
Former-commit-id: 6441290b40
2013-11-14 13:29:30 -06:00
Bryan Kowal
fde6569c34 Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching

Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1

Former-commit-id: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 8a0b0667de [formerly 4759e48c5c] [formerly 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3]]
Former-commit-id: 5339245b650c517d8012d02401b6076bf3cd1ed8 [formerly 79045d620b]
Former-commit-id: ae5e6b3927
2013-11-14 11:57:11 -06:00
Steve Harris
c214af60f6 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: d6ef4ae259 [formerly a75acc5499] [formerly 282970560ec2ee6eee13b9272e753fbb7d551416 [formerly ef852ac125]]
Former-commit-id: 495f8b46971170beee79e3e200e5aea8c63cfc3b [formerly 39e8f5ecc1]
Former-commit-id: 8307fe3a9f
2013-11-13 23:20:18 -06:00
Richard Peter
0e6f70cb31 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly e88f5777a7 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]]
Former-commit-id: e88f5777a7
Former-commit-id: 42ac155685 [formerly ed258e9421] [formerly 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74]]
Former-commit-id: ce9e0daca12be42a0eea37a51d5530a1d4b7f8d1 [formerly 58c8106da8]
Former-commit-id: 0581cc53e5
2013-11-13 16:43:26 -06:00
Greg Armendariz
13f777cc62 Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly 3f6281fdbe [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: 2d92a5719c [formerly b7c3a7e850] [formerly a557332626ac393163cd374e7ee121dc81df86a4 [formerly ce0a05242f]]
Former-commit-id: 571affa63254c2077485a938f0d063bd2b14e213 [formerly 977e0fab0e]
Former-commit-id: 8809254168
2013-11-13 15:30:55 -06:00
Brian Clements
bdf611db27 Issue #2505 removed recco from deployment
added update script to drop recco from db


Former-commit-id: 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: b5b94646cf [formerly d2f0b73626] [formerly 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9]]
Former-commit-id: 7384c5efc3b7d3bed603cfe7ab8ff291ceab0e23 [formerly d94f44d406]
Former-commit-id: 09101ca5ac
2013-11-13 13:45:44 -06:00
Bryan Kowal
89b9e26156 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: ce40d40304 [formerly a2b1211c52] [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4]]
Former-commit-id: 52598106710ffd4583947f5428f98b7eb89170c3 [formerly 1a905e8a3c]
Former-commit-id: 97c0dff26a
2013-11-13 13:16:55 -06:00
Steve Harris
91027b38db Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 2e7a594d51 [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 6af0dcf567 [formerly 80c709b3f4] [formerly 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb [formerly bc45f3668b]]
Former-commit-id: 0e519fa7a1edf2e5477d6d7126baa658bb25f2d1 [formerly 1fdc64c7e7]
Former-commit-id: 661dbe2860
2013-11-13 11:34:17 -06:00
Steve Harris
7facd4fe25 14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb [formerly b7ca6163e3] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a]
Former-commit-id: d2104614be
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
516cb4648c Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: 7b53fc40d4 [formerly c294d5d77a] [formerly 5cd030f096] [formerly 7b53fc40d4 [formerly c294d5d77a] [formerly 5cd030f096] [formerly 1c46226a11 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]]
Former-commit-id: 1c46226a11
Former-commit-id: 7cbc9b4ef3 [formerly 1a19965daf] [formerly 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4]]
Former-commit-id: b488e8fc371f0360383d01dae50168e03ac18f75 [formerly 64a37e7672]
Former-commit-id: 7ae33612c5
2013-11-13 10:52:07 -06:00
Brian Clements
9d8010e1d8 Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: 0991849617 [formerly 0d80fa7dc1] [formerly dfd88151e6] [formerly 0991849617 [formerly 0d80fa7dc1] [formerly dfd88151e6] [formerly 37f4f41d2d [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: c399d0394f [formerly c3a0ea3400] [formerly e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562]]
Former-commit-id: 43f5f85d2db77290d610b2bb501ffa92d7faa7cd [formerly ac221125f4]
Former-commit-id: eb9764b77b
2013-11-13 10:04:13 -06:00
Nate Jensen
d507cbd5dd Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly c0ed705daf [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]]
Former-commit-id: c0ed705daf
Former-commit-id: df8ddb3eac [formerly fad5c6d615] [formerly 8aeadacd76d9077469357c8afa7195a688cca933 [formerly a62e415724]]
Former-commit-id: 004d25305a2a74a752f4ba7a92f1b8bbb916144c [formerly b7085b0ed4]
Former-commit-id: 1c92fc757b
2013-11-13 09:01:09 -06:00
Brian Clements
2c76698c78 Issue #2546 added fix for TAFs that contain legacy valid times
added unit test


Former-commit-id: 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly df1542a66c [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]]
Former-commit-id: df1542a66c
Former-commit-id: 381a274111 [formerly bca5149811] [formerly 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69]]
Former-commit-id: 31f963a907811d6d1817831b842056f2d9e806f2 [formerly b511453153]
Former-commit-id: 1d41861c3c
2013-11-13 08:07:29 -06:00
Bryan Kowal
1134d55c7b Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]]
Former-commit-id: e3639da703
Former-commit-id: ad1e4c66b8 [formerly b2c63727ba] [formerly 9b2674319137dc98ffe2e221d63d5f3dae8f1e22 [formerly 48d5d8c3a1]]
Former-commit-id: 05930d677355374fbcc6438692928f1740b35460 [formerly a575f41589]
Former-commit-id: cfb3717a61
2013-11-12 19:57:25 -06:00
Bryan Kowal
6b9cae71e2 Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly d76033ff3d [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]]
Former-commit-id: d76033ff3d
Former-commit-id: d8a1e15951 [formerly e9ff5e018b] [formerly 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588]]
Former-commit-id: 5a7b66c6f75c115cad84c4d0aaf076e8a21ad3a3 [formerly 8867114ff8]
Former-commit-id: d83504922b
2013-11-12 17:43:10 -06:00
Nate Jensen
ad4f555802 Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly f0b386b632 [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]]
Former-commit-id: f0b386b632
Former-commit-id: 793a7f6544 [formerly ec073efd45] [formerly dfb26a2628a5b054a3463a05d41c518dd8e86068 [formerly 80227c4750]]
Former-commit-id: 73824090615da78d44f25ffa6e0796a9268ffcc8 [formerly 633faf692b]
Former-commit-id: 6b4284ec55
2013-11-12 16:55:31 -06:00
Nate Jensen
a9d73bb3fa Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly b1d376e238 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]]
Former-commit-id: b1d376e238
Former-commit-id: ad6d935205 [formerly b0cfb6e836] [formerly 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f [formerly 645e816d5d]]
Former-commit-id: 8056424dfb851f8b8deb8e86c061748dbf6ffbc1 [formerly 983afa0eea]
Former-commit-id: abf56dec05
2013-11-12 16:48:32 -06:00
Dave Hladky
6ee91eff8a Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]]
Former-commit-id: e3a259182c
Former-commit-id: b467763805 [formerly f2f670bc00] [formerly a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a]]
Former-commit-id: 454826e2ebc64df06b520cf75175b5fe9f328956 [formerly 86363574b3]
Former-commit-id: fa2238778d
2013-11-12 14:55:41 -06:00
Nate Jensen
03c16ff64b Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly c60228c854 [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]]
Former-commit-id: c60228c854
Former-commit-id: 8dacce7f9b [formerly c6e10ebdef] [formerly 5dddfaa7f46782e5270d7070d02a28f1d2f20a01 [formerly a1315f1072]]
Former-commit-id: 2e43027e215f7cefcc48aa4b0df6ded67da6bbd2 [formerly a53cf1a079]
Former-commit-id: 73d6499cc0
2013-11-12 14:41:34 -06:00
Greg Armendariz
df22d0db38 Issue #2512 - Remove dead code
Former-commit-id: b429bf2588 [formerly 59f8eb9341] [formerly 4f4d59aa52] [formerly b429bf2588 [formerly 59f8eb9341] [formerly 4f4d59aa52] [formerly 70c9a36826 [formerly 4f4d59aa52 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]]]
Former-commit-id: 70c9a36826
Former-commit-id: 12dfecc863 [formerly f878a8e302] [formerly 1d7219743606de751141dfd69c8aab0a62160ea6 [formerly fbcb810ab3]]
Former-commit-id: c2036e42c06dfb0f3938cd763917db7377259c64 [formerly 3852935abf]
Former-commit-id: bbd6cd614b
2013-11-12 14:20:21 -06:00
Richard Peter
b4e255a976 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]]
Former-commit-id: f12839a9e5
Former-commit-id: 51f9a7fe54 [formerly 502d67591b] [formerly d63f1f5f4506e36003ebe3658bbae7045d51f7d9 [formerly c8ff79a7f5]]
Former-commit-id: a6a02709b082eebc1c33d818028dc638fba6569a [formerly 0cf51fce74]
Former-commit-id: 7855a8f000
2013-11-12 13:47:04 -06:00
Nate Jensen
5e53b2d074 Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 821c8d2a30 [formerly 6707d1aadf] [formerly 692ea76d75] [formerly 821c8d2a30 [formerly 6707d1aadf] [formerly 692ea76d75] [formerly a4ece1d116 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]]
Former-commit-id: a4ece1d116
Former-commit-id: 25047d10d5 [formerly 4b329513e5] [formerly bb48885fad4303574e632bfa0ef5cef5bf842c6d [formerly 2e86520b53]]
Former-commit-id: fbb07670a286e23a919608b81c889cfa4b8bd22f [formerly 5c7be238a0]
Former-commit-id: ec0025a309
2013-11-12 13:02:49 -06:00
Nate Jensen
fddb55dc4d Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]]
Former-commit-id: 64aa00bad6
Former-commit-id: f673de2e99 [formerly 7a5f716d70] [formerly 9e53a2808b9310818f353602936e9b93270e44e7 [formerly 39679b0608]]
Former-commit-id: 31537865a0c927339a6d678895ead733e422918e [formerly f618186c69]
Former-commit-id: db3a33864f
2013-11-12 12:46:38 -06:00
Brad Gonzales
0aa3b220bf Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 725742f4ec [formerly 7747d901f7] [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0]]
Former-commit-id: 0b81bcbc6ab893fa04a28ec2f1a491d80e5eeec8 [formerly bad9b3242a]
Former-commit-id: a626b240ce
2013-11-12 12:42:16 -06:00
Brian Clements
89f460969d Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: e9b4f777e1 [formerly 9f7e85450d] [formerly 8b0e85f82c] [formerly e9b4f777e1 [formerly 9f7e85450d] [formerly 8b0e85f82c] [formerly 4050eb5f3e [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]]]
Former-commit-id: 4050eb5f3e
Former-commit-id: 3351401cb6 [formerly 4d3c2f488c] [formerly 6cca22845871692e5d67bd3e6d781e22aab81c7d [formerly ba12c7467d]]
Former-commit-id: dc41493dc42e3f081d5a737dff2eb4134616deaa [formerly 94a9ea2ff0]
Former-commit-id: b970c720de
2013-11-12 12:41:50 -06:00
Nate Jensen
361eb30aaf Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: 1747b23290 [formerly b71f2463da] [formerly 3f86a3735e] [formerly 1747b23290 [formerly b71f2463da] [formerly 3f86a3735e] [formerly eed4c8604b [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]]]
Former-commit-id: eed4c8604b
Former-commit-id: 0c999d40dd [formerly b0600c60ce] [formerly e300fc5ad7ce2f811eabeaaee0fd88234f5a7008 [formerly 18d790a423]]
Former-commit-id: 99218aaf830cc33d3e91fd60286e630f42edca21 [formerly 1f4af0c06a]
Former-commit-id: 6185a257df
2013-11-12 12:13:58 -06:00
Richard Peter
680a54d2d5 Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 7bd2cdb170 [formerly 4d82382054] [formerly 8afc87e570] [formerly 7bd2cdb170 [formerly 4d82382054] [formerly 8afc87e570] [formerly 61fc3eba44 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]]]
Former-commit-id: 61fc3eba44
Former-commit-id: be32cf8237 [formerly d66aaa7746] [formerly b49bd79f027e2a7d4129d4e1a9aa4cdf3f6a55d0 [formerly b8b01f6305]]
Former-commit-id: bf183aa6e0aa24b2877bc67aebb4d6c8dfeaed01 [formerly c60b0849b3]
Former-commit-id: 24eb06f591
2013-11-12 11:18:56 -06:00
Richard Peter
ff729f46b5 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295]
Former-commit-id: ef23a8f65b
2013-11-12 11:11:36 -06:00
Nate Jensen
0c2d27c3ca Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager

Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac

Former-commit-id: a1fadcf38f [formerly 6c016a6bb6] [formerly 1ee5d91af2] [formerly a1fadcf38f [formerly 6c016a6bb6] [formerly 1ee5d91af2] [formerly 2cdc7e5e63 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: e2db59a055 [formerly 98cbafe95c] [formerly 62f6799a9e992798bc661107dd6e08c64c9810c5 [formerly 368d73449e]]
Former-commit-id: a37e5bc8d3f0a758722efebc08d2981f350a0deb [formerly 66ff41e961]
Former-commit-id: b92c73f16f
2013-11-12 11:03:51 -06:00
Dave Hladky
5b4297b398 Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly 976eece1b1 [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]]]
Former-commit-id: 976eece1b1
Former-commit-id: 3d5ca2453b [formerly 3f5b80e5b3] [formerly 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea]]
Former-commit-id: 2fbe443c2e385e5f4ebf6922d2f5d909c21e1fcc [formerly e410d1f44b]
Former-commit-id: 6a9c0a6fa8
2013-11-12 10:58:50 -06:00
Nate Jensen
7cd003eda9 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly da8a858727 [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]]
Former-commit-id: da8a858727
Former-commit-id: 493d79f524 [formerly ddebd81c73] [formerly 9671b7375763905e318a2a92acb4933c27a059b8 [formerly d758e5ab57]]
Former-commit-id: 58b849d5f1654c0d9121acbfd8935de1329365c0 [formerly f1b25ed227]
Former-commit-id: 83c9d010c4
2013-11-12 10:55:40 -06:00
Brad Gonzales
3c70ba2cb4 Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly ff5edde334 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]]
Former-commit-id: ff5edde334
Former-commit-id: 66d22943ed [formerly 1987184f87] [formerly 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3]]
Former-commit-id: 4f74e3c469450a036eb47f21a5ab1ff474af8c5c [formerly 1b084e4efa]
Former-commit-id: b7fca60f7d
2013-11-12 10:50:06 -06:00
Nate Jensen
7cc8abb191 Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly d8f2ffbceb [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: d1e5b5e0dc [formerly 5899801877] [formerly 30a720690f9ddf9e80cde824f8524806bc0200e8 [formerly 68866c322c]]
Former-commit-id: 2f10d09e884cba80b4ac4bc61e8a1f5765b66353 [formerly f55aa5aea0]
Former-commit-id: 1ed84f8f63
2013-11-12 10:39:51 -06:00