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
Steve Harris
c52a724799
13.5.3-8 baseline
...
Former-commit-id: ed8ef11cb8
[formerly e644eb9219
] [formerly 4029c51fbf
] [formerly b05ffb2108
[formerly 4029c51fbf
[formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]
Former-commit-id: b05ffb2108
Former-commit-id: fecf6ab52aeb75463fdc9128c8ec88a97cf188f0 [formerly e86f211430
]
Former-commit-id: 28e5c8f540
2013-11-15 09:28:00 -05:00
Brad Gonzales
66a8a30092
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 53d4de12d9
[formerly aa8fb36fc1
[formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010
]
Former-commit-id: 4ec5ee7f74
2013-11-15 08:00:47 -06: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
Bryan Kowal
e810496889
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
...
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: 8b274264c9
[formerly 782675951b
] [formerly be78fab116
] [formerly ce16efc9a1
[formerly be78fab116
[formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 5e386da33f46128ec2187010bd711c2f5ecf11d8 [formerly a6ea71d46f
]
Former-commit-id: 512fc1a7c1
2013-11-14 15:17: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
Lee Venable
0e326c2a12
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: 2f134e6aa3
[formerly bd81ec8807
] [formerly 834c2ac8da
] [formerly f0ebee3bb3
[formerly 834c2ac8da
[formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: a74585351b2263565cb70d9d704cba8fb765886e [formerly 7d04b2e4ce
]
Former-commit-id: e9b8ee42c7
2013-11-14 14:43:18 -06:00
Mike Duff
b27ee6803f
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: c3aee76403
[formerly f6c4ca2bc0
] [formerly 87a4b1bec4
] [formerly a80964bc7c
[formerly 87a4b1bec4
[formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42
]
Former-commit-id: 48093514a6
2013-11-14 14:40:33 -06:00
Richard Peter
625647a717
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 0074b774f0
[formerly 79bdd34f4f
[formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41
]
Former-commit-id: b4aac09ff4
2013-11-14 14:40:23 -06:00
Lee Venable
b93b05165c
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d42589d14f
[formerly 6086c06f66
] [formerly d431f3c0f4
] [formerly bc7f5e556d
[formerly d431f3c0f4
[formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc
]
Former-commit-id: 69934b9b32
2013-11-14 14:33:18 -06:00
Richard Peter
df3e6735af
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 7c5e85a288
[formerly 5c5e71a01b
] [formerly 4d18c7d493
] [formerly 3f5c590c5f
[formerly 4d18c7d493
[formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c
]
Former-commit-id: 6af248f212
2013-11-14 13:30:09 -06:00
Nate Jensen
ddcca3463d
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68
[formerly a4eb19fc79
] [formerly b7f992b9856796b232897d2f5aa72126f4eed83b [formerly 9acda0b9f2
]] [formerly c5cf68cc45
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69
]
Former-commit-id: e41f57da67
2013-11-14 13:29:30 -06:00
Bryan Kowal
8a0b0667de
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 7e35ea310f
[formerly 2029c34f24
[formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3
]
Former-commit-id: 4759e48c5c
2013-11-14 11:57:11 -06:00
Steve Harris
d6ef4ae259
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 361df767a8
[formerly 77ea1782c3
] [formerly 473488f5b8
] [formerly 4d25eb11c8
[formerly 473488f5b8
[formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: 282970560ec2ee6eee13b9272e753fbb7d551416 [formerly ef852ac125
]
Former-commit-id: a75acc5499
2013-11-13 23:20:18 -06:00
Richard Peter
42ac155685
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: 9e4949eeb9
[formerly adc30e817e
] [formerly 2f3eee1439
] [formerly e88f5777a7
[formerly 2f3eee1439
[formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74
]
Former-commit-id: ed258e9421
2013-11-13 16:43:26 -06:00
Greg Armendariz
2d92a5719c
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 3f6281fdbe
[formerly 83ac36721b
[formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: a557332626ac393163cd374e7ee121dc81df86a4 [formerly ce0a05242f
]
Former-commit-id: b7c3a7e850
2013-11-13 15:30:55 -06:00
Brian Clements
b5b94646cf
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 3204a2f7b5
[formerly 3551b731e0
] [formerly 95f1621d3e
] [formerly 8cbe2c06a8
[formerly 95f1621d3e
[formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9
]
Former-commit-id: d2f0b73626
2013-11-13 13:45:44 -06:00
Bryan Kowal
ce40d40304
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 0544b66f4e
[formerly 86dd200844
[formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4
]
Former-commit-id: a2b1211c52
2013-11-13 13:16:55 -06:00
Steve Harris
6af0dcf567
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 3e8014e9f8
[formerly eb470599f3
] [formerly 0a37219d2a
] [formerly 2e7a594d51
[formerly 0a37219d2a
[formerly ebde6dc849a1ca9753f959423109186c836b4525]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb [formerly bc45f3668b
]
Former-commit-id: 80c709b3f4
2013-11-13 11:34:17 -06:00
Steve Harris
1902ca9cfb
14.1.1-8 baseline
...
Former-commit-id: 8606fed724
[formerly 90bc008a50
] [formerly aa6c977e7b
] [formerly c7d36eb6ad
[formerly aa6c977e7b
[formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9
]
Former-commit-id: b7ca6163e3
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
7cbc9b4ef3
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 7b53fc40d4
[formerly c294d5d77a
] [formerly d1769bae732e9e8f04b6407fdf659ac6eeaae5c3 [formerly 5cd030f096
]] [formerly 1c46226a11
[formerly 5cd030f096
[formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]
Former-commit-id: 1c46226a11
Former-commit-id: 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4
]
Former-commit-id: 1a19965daf
2013-11-13 10:52:07 -06:00
Brian Clements
c399d0394f
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 a1efb536e48a75742d84cd92212efeb7e692e012 [formerly dfd88151e6
]] [formerly 37f4f41d2d
[formerly dfd88151e6
[formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562
]
Former-commit-id: c3a0ea3400
2013-11-13 10:04:13 -06:00
Nate Jensen
df8ddb3eac
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
...
Former-commit-id: 47f8811992
[formerly 51ba5f770c
] [formerly 85923b0f7f
] [formerly c0ed705daf
[formerly 85923b0f7f
[formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]
Former-commit-id: c0ed705daf
Former-commit-id: 8aeadacd76d9077469357c8afa7195a688cca933 [formerly a62e415724
]
Former-commit-id: fad5c6d615
2013-11-13 09:01:09 -06:00
Brian Clements
381a274111
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: 04a9d3ae08
[formerly b0a5192dfa
] [formerly 191ffc6e63
] [formerly df1542a66c
[formerly 191ffc6e63
[formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]
Former-commit-id: df1542a66c
Former-commit-id: 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69
]
Former-commit-id: bca5149811
2013-11-13 08:07:29 -06:00
Bryan Kowal
ad1e4c66b8
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
...
Former-commit-id: 8afbe25d22
[formerly b2272ad695
] [formerly a51231058a
] [formerly e3639da703
[formerly a51231058a
[formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]
Former-commit-id: e3639da703
Former-commit-id: 9b2674319137dc98ffe2e221d63d5f3dae8f1e22 [formerly 48d5d8c3a1
]
Former-commit-id: b2c63727ba
2013-11-12 19:57:25 -06:00
Bryan Kowal
d8a1e15951
Issue #2297 - update build scripts to complete the full delta build
...
Former-commit-id: 46264b5fcc
[formerly 631c03601c
] [formerly 7cac007ef1
] [formerly d76033ff3d
[formerly 7cac007ef1
[formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]
Former-commit-id: d76033ff3d
Former-commit-id: 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588
]
Former-commit-id: e9ff5e018b
2013-11-12 17:43:10 -06:00
Nate Jensen
793a7f6544
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: b59a0230e5
[formerly f2f778c042
] [formerly accfefae6d
] [formerly f0b386b632
[formerly accfefae6d
[formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]
Former-commit-id: f0b386b632
Former-commit-id: dfb26a2628a5b054a3463a05d41c518dd8e86068 [formerly 80227c4750
]
Former-commit-id: ec073efd45
2013-11-12 16:55:31 -06:00
Nate Jensen
ad6d935205
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
...
Former-commit-id: decad66d76
[formerly 8df2c48648
] [formerly 8cf1b752e0
] [formerly b1d376e238
[formerly 8cf1b752e0
[formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]
Former-commit-id: b1d376e238
Former-commit-id: 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f [formerly 645e816d5d
]
Former-commit-id: b0cfb6e836
2013-11-12 16:48:32 -06:00
Dave Hladky
b467763805
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 80ce7ec3e7
[formerly 5313c8b68d
] [formerly 643a150777
] [formerly e3a259182c
[formerly 643a150777
[formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]
Former-commit-id: e3a259182c
Former-commit-id: a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a
]
Former-commit-id: f2f670bc00
2013-11-12 14:55:41 -06:00
Nate Jensen
8dacce7f9b
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: 568e9dacba
[formerly edb2b6d217
] [formerly 5e02427d6e
] [formerly c60228c854
[formerly 5e02427d6e
[formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]
Former-commit-id: c60228c854
Former-commit-id: 5dddfaa7f46782e5270d7070d02a28f1d2f20a01 [formerly a1315f1072
]
Former-commit-id: c6e10ebdef
2013-11-12 14:41:34 -06:00
Greg Armendariz
12dfecc863
Issue #2512 - Remove dead code
...
Former-commit-id: b429bf2588
[formerly 59f8eb9341
] [formerly 0be393b8ccb5253951f4c16f85e7d23b3e9f3687 [formerly 4f4d59aa52
]] [formerly 70c9a36826
[formerly 4f4d59aa52
[formerly c07118fed79b6e50694281e40b3fb3755484d911]]]
Former-commit-id: 70c9a36826
Former-commit-id: 1d7219743606de751141dfd69c8aab0a62160ea6 [formerly fbcb810ab3
]
Former-commit-id: f878a8e302
2013-11-12 14:20:21 -06:00
Richard Peter
51f9a7fe54
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: 8214774545
[formerly c25ba19514
] [formerly 9af1de07d4
] [formerly f12839a9e5
[formerly 9af1de07d4
[formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]
Former-commit-id: f12839a9e5
Former-commit-id: d63f1f5f4506e36003ebe3658bbae7045d51f7d9 [formerly c8ff79a7f5
]
Former-commit-id: 502d67591b
2013-11-12 13:47:04 -06:00
Nate Jensen
25047d10d5
Issue #2361 better logging of viz spring initialization of bundles
...
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b
Former-commit-id: 821c8d2a30
[formerly 6707d1aadf
] [formerly 692ea76d75
] [formerly a4ece1d116
[formerly 692ea76d75
[formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]
Former-commit-id: a4ece1d116
Former-commit-id: bb48885fad4303574e632bfa0ef5cef5bf842c6d [formerly 2e86520b53
]
Former-commit-id: 4b329513e5
2013-11-12 13:02:49 -06:00
Nate Jensen
f673de2e99
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: 05068bb1f3
[formerly db61d36b4e
] [formerly 88af1ddfcb
] [formerly 64aa00bad6
[formerly 88af1ddfcb
[formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]
Former-commit-id: 64aa00bad6
Former-commit-id: 9e53a2808b9310818f353602936e9b93270e44e7 [formerly 39679b0608
]
Former-commit-id: 7a5f716d70
2013-11-12 12:46:38 -06:00
Brad Gonzales
725742f4ec
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 aea0e847aa
[formerly 8f70fb1d0c
[formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]
Former-commit-id: aea0e847aa
Former-commit-id: 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0
]
Former-commit-id: 7747d901f7
2013-11-12 12:42:16 -06:00
Brian Clements
3351401cb6
Issue #2539 removed java 7 specific code from exception subclass
...
Former-commit-id: e9b4f777e1
[formerly 9f7e85450d
] [formerly 8b0e85f82c
] [formerly 4050eb5f3e
[formerly 8b0e85f82c
[formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]]
Former-commit-id: 4050eb5f3e
Former-commit-id: 6cca22845871692e5d67bd3e6d781e22aab81c7d [formerly ba12c7467d
]
Former-commit-id: 4d3c2f488c
2013-11-12 12:41:50 -06:00
Nate Jensen
0c999d40dd
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
...
Former-commit-id: 1747b23290
[formerly b71f2463da
] [formerly 3f86a3735e
] [formerly eed4c8604b
[formerly 3f86a3735e
[formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]]
Former-commit-id: eed4c8604b
Former-commit-id: e300fc5ad7ce2f811eabeaaee0fd88234f5a7008 [formerly 18d790a423
]
Former-commit-id: b0600c60ce
2013-11-12 12:13:58 -06:00
Richard Peter
be32cf8237
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
...
Former-commit-id: 7bd2cdb170
[formerly 4d82382054
] [formerly 8afc87e570
] [formerly 61fc3eba44
[formerly 8afc87e570
[formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]]
Former-commit-id: 61fc3eba44
Former-commit-id: b49bd79f027e2a7d4129d4e1a9aa4cdf3f6a55d0 [formerly b8b01f6305
]
Former-commit-id: d66aaa7746
2013-11-12 11:18:56 -06:00
Richard Peter
112816a54c
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 460a7b8b5d
[formerly 306bd6fae1
[formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d
]
Former-commit-id: 3f68fc6eed
2013-11-12 11:11:36 -06:00
Nate Jensen
e2db59a055
Issue #2361 static lazy initialization of SubscriptionOverlapService's
...
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: a1fadcf38f
[formerly 6c016a6bb6
] [formerly 1ee5d91af2
] [formerly 2cdc7e5e63
[formerly 1ee5d91af2
[formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: 62f6799a9e992798bc661107dd6e08c64c9810c5 [formerly 368d73449e
]
Former-commit-id: 98cbafe95c
2013-11-12 11:03:51 -06:00
Dave Hladky
3d5ca2453b
Issue #2448 fix scheduling for start/stop of subscription.
...
Former-commit-id: af66d970dd
[formerly efa18426a1
] [formerly b6f1468b7e
] [formerly 976eece1b1
[formerly b6f1468b7e
[formerly de110d3747096601a122f64cc5d6037823213e92]]]
Former-commit-id: 976eece1b1
Former-commit-id: 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea
]
Former-commit-id: 3f5b80e5b3
2013-11-12 10:58:50 -06:00
Nate Jensen
493d79f524
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
...
Former-commit-id: 695f25ba66
[formerly 3480148f14
] [formerly bca5793e3d
] [formerly da8a858727
[formerly bca5793e3d
[formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]
Former-commit-id: da8a858727
Former-commit-id: 9671b7375763905e318a2a92acb4933c27a059b8 [formerly d758e5ab57
]
Former-commit-id: ddebd81c73
2013-11-12 10:55:40 -06:00
Brad Gonzales
66d22943ed
Issue #2506 Added subscription notification service to bandwidth manager.
...
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: 2cc78d880e
[formerly cbdb9dfb4f
] [formerly cd221e5263
] [formerly ff5edde334
[formerly cd221e5263
[formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]
Former-commit-id: ff5edde334
Former-commit-id: 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3
]
Former-commit-id: 1987184f87
2013-11-12 10:50:06 -06:00
Nate Jensen
d1e5b5e0dc
Merge "Issue #2377 fixed error handling in QPF config" into development
...
Former-commit-id: 881e9efc68
[formerly 74d7dfd7da
] [formerly 3054868350
] [formerly d8f2ffbceb
[formerly 3054868350
[formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 30a720690f9ddf9e80cde824f8524806bc0200e8 [formerly 68866c322c
]
Former-commit-id: 5899801877
2013-11-12 10:39:51 -06:00
Nate Jensen
d2f15c928c
Merge "Issue #2539 added GZIP support to WFS REST" into development
...
Former-commit-id: bf4406d124
[formerly cd5b0576b0
] [formerly f1b8eecca7
] [formerly 8c4608630d
[formerly f1b8eecca7
[formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]]
Former-commit-id: 8c4608630d
Former-commit-id: 7d794297e4516fd184a29fd40a964387c686691f [formerly b87efc6860
]
Former-commit-id: f240b80d6f
2013-11-12 10:39:44 -06:00