Commit graph

120 commits

Author SHA1 Message Date
Richard Peter
414ccec00e Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]]
Former-commit-id: 50a1b270c5
Former-commit-id: 1d6e9816e0
2014-02-27 15:18:26 -06:00
Dave Hladky
269e0e89f1 Issue #2469 Fixed default rules implementation
Former-commit-id: b81e92e5be [formerly d31708962b] [formerly f9c6a396f0] [formerly f9c6a396f0 [formerly 1d256bfcee]] [formerly 45413d0db4 [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]]
Former-commit-id: 45413d0db4
Former-commit-id: 0f8d74dd64c00ec1a5b3486e2d8603f3115e26b7 [formerly 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76] [formerly dc97eb7890 [formerly ff5a5961db]]
Former-commit-id: dc97eb7890
Former-commit-id: 05c81677d2
2014-02-24 13:06:52 -06:00
Benjamin Phillippe
57be348cfc Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 5d46aaf0fb [formerly 5de996ac4a] [formerly 3f4b92fffb] [formerly 3f4b92fffb [formerly 1691c5a3ff]] [formerly fc589ed84d [formerly 3f4b92fffb [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]]
Former-commit-id: fc589ed84d
Former-commit-id: b769711fce2a2f3e101bb0ba2e48ce3a01563a7a [formerly b3183ec5423ee6e72bab494f9fa0adc8a517ca47] [formerly 20d26dc5a0 [formerly cdaa7e32b4]]
Former-commit-id: 20d26dc5a0
Former-commit-id: 1e0a1a6df8
2014-02-04 10:24:11 -06:00
Steve Harris
fb32d16493 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: 021d90e2ee [formerly f562540e7c] [formerly 14ba3b29f4] [formerly 14ba3b29f4 [formerly 1738185503]] [formerly 1aea63a1f6 [formerly 14ba3b29f4 [formerly 1738185503] [formerly 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: 628228e90b0e79d03cf47b1788bf99b102454778 [formerly 5d9047e5063900e85cef179c5be76057b8ca6cd1] [formerly d9cd003a5a [formerly 1fd5b2255f]]
Former-commit-id: d9cd003a5a
Former-commit-id: cdb99cc3e0
2014-01-29 09:41:57 -06:00
Dave Hladky
3bfc7f7c1c Issue #2584 Step one of versioning for DD
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00

Former-commit-id: a876043b7f [formerly c8af2af177] [formerly e15b9e2ba9] [formerly e15b9e2ba9 [formerly 523e100fd0]] [formerly 690b5b73cf [formerly e15b9e2ba9 [formerly 523e100fd0] [formerly 690b5b73cf [formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]]]]
Former-commit-id: 690b5b73cf
Former-commit-id: 02909013235963e7e3fd2a70ffef1e40d38918c5 [formerly 980f786bfb20e2cd526cc5a268a6de91237106d0] [formerly c87bd8b764 [formerly dccf640640]]
Former-commit-id: c87bd8b764
Former-commit-id: 415f804868
2014-01-24 14:44:12 -06:00
Benjamin Phillippe
eba07d8dee Issue #2613 Registry performance enhancements. Better handling of delete events.
Change-Id: I56d3f5c37778e717810b6a698ec9405ed3cde00a

Former-commit-id: 0d9c491e77 [formerly eac441fe9d] [formerly 216651e387] [formerly 216651e387 [formerly b53a0b258d]] [formerly 95b0f12880 [formerly 216651e387 [formerly b53a0b258d] [formerly 95b0f12880 [formerly f863897fd512acae11364eb6b4737339b5951da0]]]]
Former-commit-id: 95b0f12880
Former-commit-id: b85c7f49a23fae895b5b5cb69beb32b90bc7ce09 [formerly 297ada9d33f4ef43219cbfee244f83ccb5c7a3d1] [formerly 51c7a7bd45 [formerly c82b289e2d]]
Former-commit-id: 51c7a7bd45
Former-commit-id: ab2240c0ca
2014-01-21 15:02:59 -06:00
Steve Harris
71ee956b9d Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 261b4709df [formerly 56f5ae9f48] [formerly a465718a0d] [formerly a465718a0d [formerly 24ab7cff49]] [formerly 69dc3d835b [formerly a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: e2a897e591e4f75dcb9349f928b85e3f3a2f6f5a [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02] [formerly b62efa9387 [formerly 252c7ee40a]]
Former-commit-id: b62efa9387
Former-commit-id: 6cb92b1f57
2014-01-21 12:36:54 -06:00
Benjamin Phillippe
a60803f25e Issue #2613 Rewrote poorly written section of code in NotificationListenerImpl
Change-Id: Ibcdd415667f379a20799a4166b12cc8cc5e05ed4

Former-commit-id: 4c761c952b [formerly a7b5af7b23] [formerly d81f8ddf89] [formerly d81f8ddf89 [formerly 6b0d25cf5c]] [formerly 7516310ab1 [formerly d81f8ddf89 [formerly 6b0d25cf5c] [formerly 7516310ab1 [formerly 4d4c7837ad1084b8c6007c660c59e3bd29f757cc]]]]
Former-commit-id: 7516310ab1
Former-commit-id: ba45224686936e22031b3ce837f315c743822e60 [formerly 7ffb3aace3c502189a5fde4d7cc07dad5db68804] [formerly 760fb70dde [formerly 407687aeb3]]
Former-commit-id: 760fb70dde
Former-commit-id: 962126471f
2014-01-17 12:07:34 -06:00
Dave Hladky
c5b5a43ea0 Issue #2613 StandardCharsets NIO dependency removed.
Change-Id: I7ba841e1f1e480561d3c7302e8b00ecfaab41f24

Former-commit-id: 14bc3bfdb8 [formerly 2776bd1921] [formerly 0429acfb81] [formerly 0429acfb81 [formerly c342681a0b]] [formerly 33aeec0cb4 [formerly 0429acfb81 [formerly c342681a0b] [formerly 33aeec0cb4 [formerly a9e1fbf4f19beecc2935cb992380f27cb2298ddb]]]]
Former-commit-id: 33aeec0cb4
Former-commit-id: cd69ea4417454794f6429e8a20b9126f2d90adac [formerly 2594df8a99fa587512baac7f53dd244f40810b3b] [formerly ae3293f065 [formerly f7b5ce629a]]
Former-commit-id: ae3293f065
Former-commit-id: 2761f0990e
2014-01-16 09:21:35 -06:00
Benjamin Phillippe
7fcc6e01e2 Issue #2613 Registry peformance enhancements
-- Added indexes to registry tables
            -- Better cleanup when a registry leaves the federation
            -- Batching of queries in notification handler to reduce number of web service calls
            -- Added Hibernate flushes and clears to better manage memory

Change-Id: I88ec580694d2104458391a798667748c88f16dd0

Former-commit-id: 294e221944 [formerly 2efe31b5ee] [formerly c3e9724e7e] [formerly c3e9724e7e [formerly fd30caddb0]] [formerly 83bec75737 [formerly c3e9724e7e [formerly fd30caddb0] [formerly 83bec75737 [formerly 4344ffec77286a531b9be29e9ef94acd9c6ce342]]]]
Former-commit-id: 83bec75737
Former-commit-id: 3aa37d9872cf3d2da3d3c0c3a7c03abc584c92b3 [formerly c781dab1bf9255a5669e2875c5a75bee4165d557] [formerly 70446e302e [formerly 59d5644742]]
Former-commit-id: 70446e302e
Former-commit-id: a41530f2df
2014-01-15 16:09:13 -06:00
Mike Duff
a4649801bb Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 1c2129636c [formerly 99d7e51456] [formerly 30b65a4fe7] [formerly 30b65a4fe7 [formerly 183ca614df]] [formerly a264cb06a1 [formerly 30b65a4fe7 [formerly 183ca614df] [formerly a264cb06a1 [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]]
Former-commit-id: a264cb06a1
Former-commit-id: 1d53589aae333bfbef17fe6c7cd4ba79441d556e [formerly 1723170c25ee5bf976e58a1096d080a768d79925] [formerly 05b6508299 [formerly 4620b69f08]]
Former-commit-id: 05b6508299
Former-commit-id: f6d58f7615
2014-01-09 10:29:21 -06:00
Max Schenkelberg
96f972a617 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 4adb40e333 [formerly 30059d255c] [formerly b3aed99142] [formerly b3aed99142 [formerly 16046a4dde]] [formerly cc2080449c [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: e16937349bd8e68e34180a13f051ca191ec3a50a [formerly d612c358920d902e7385e86659fc1d050de57dd4] [formerly 0ceaa43902 [formerly f58795f460]]
Former-commit-id: 0ceaa43902
Former-commit-id: 257553461b
2014-01-06 17:03:45 -06:00
Benjamin Phillippe
b9c90a5041 Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: 944cd577fb [formerly edc39cafac] [formerly 5f3e8a5436] [formerly 5f3e8a5436 [formerly 7529f5bbe8]] [formerly 2e909bc207 [formerly 5f3e8a5436 [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]]
Former-commit-id: 2e909bc207
Former-commit-id: 26be26f9460dce76cce998986e7c5a090f086982 [formerly 68b4e030b4ac73f474d7331cc758905d41a0b7bd] [formerly 60d141c6a4 [formerly 620e838f59]]
Former-commit-id: 60d141c6a4
Former-commit-id: 9d3c42381b
2013-12-12 09:44:05 -06:00
Benjamin Phillippe
0c3040783c Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: 73a3d4886d [formerly fd4e9edb76] [formerly b2c565c173] [formerly b2c565c173 [formerly 969099d4c4]] [formerly 0cb4e61261 [formerly b2c565c173 [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]]
Former-commit-id: 0cb4e61261
Former-commit-id: 3b056f1129e80d717d3f2a0cef0416edf9a9cc9f [formerly a1014b45f1af11aad2b8627651760da5407df827] [formerly bfa17652ff [formerly 0d98a48d18]]
Former-commit-id: bfa17652ff
Former-commit-id: d794e8efed
2013-12-11 12:20:12 -06:00
Benjamin Phillippe
9587bbccc5 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: 83b97a2195 [formerly da4f658b7a] [formerly ed890ce9d9] [formerly ed890ce9d9 [formerly 0b0e70b667]] [formerly ed77440c28 [formerly ed890ce9d9 [formerly 0b0e70b667] [formerly ed77440c28 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]]
Former-commit-id: ed77440c28
Former-commit-id: 8e442efae40464e0d83dc13de40b787fb9214467 [formerly 30d36d7bd29ad367d12eab6b8c4f863628e42d08] [formerly 7051d10140 [formerly 7ed6195536]]
Former-commit-id: 7051d10140
Former-commit-id: 2165a9059a
2013-12-05 10:20:24 -06:00
Dave Hladky
bbbfb8d925 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 9bdbabc098 [formerly bce11dec14] [formerly 6607e5fe30] [formerly 6607e5fe30 [formerly 483ec5d22f]] [formerly 593f24023d [formerly 6607e5fe30 [formerly 483ec5d22f] [formerly 593f24023d [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]]
Former-commit-id: 593f24023d
Former-commit-id: b40445648d87cf940631be19b9d91609156ef8e7 [formerly 035f4702c002daa8199c28c0d3ad1c8b496bd6ab] [formerly 09aa3a6c62 [formerly 4060748634]]
Former-commit-id: 09aa3a6c62
Former-commit-id: 36f601253e
2013-12-04 11:58:49 -06:00
Benjamin Phillippe
5b5a20ebd4 Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 64e533994c [formerly 67f6ee0999] [formerly f4144fca06] [formerly f4144fca06 [formerly 212bbeb379]] [formerly 31b53f4ad9 [formerly f4144fca06 [formerly 212bbeb379] [formerly 31b53f4ad9 [formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 50e3c5703bb629064a1f6a768b0e45d2509d49b2 [formerly 9bc982c030242d6a1ff819c729fdbb6438d12813] [formerly 495f70a5cf [formerly 2fa17aab7f]]
Former-commit-id: 495f70a5cf
Former-commit-id: 615b5ce605
2013-11-27 12:07:59 -06:00
Bryan Kowal
8d2303551d 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: 11154ed8bd [formerly 8b274264c9] [formerly 782675951b] [formerly 782675951b [formerly be78fab116]] [formerly ce16efc9a1 [formerly 782675951b [formerly be78fab116] [formerly ce16efc9a1 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 6781b56d6c0a82f5f91f50cd6cbd6000c5e14b39 [formerly 5e386da33f46128ec2187010bd711c2f5ecf11d8] [formerly 512fc1a7c1 [formerly a6ea71d46f]]
Former-commit-id: 512fc1a7c1
Former-commit-id: e810496889
2013-11-14 15:17:28 -06:00
Benjamin Phillippe
5a330539dc Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: ff3218932b [formerly 7b53fc40d4] [formerly c294d5d77a] [formerly d1769bae732e9e8f04b6407fdf659ac6eeaae5c3 [formerly c294d5d77a [formerly 5cd030f096]]] [formerly 1c46226a11 [formerly c294d5d77a [formerly 5cd030f096] [formerly 1c46226a11 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]]
Former-commit-id: 1c46226a11
Former-commit-id: fbf1bc69d5ed89337832d9bcca75acb9fa5319c1 [formerly 02517e3b01d1874cc92736a35804499b6a45c0d6] [formerly 1a19965daf [formerly fe7c6886c4]]
Former-commit-id: 1a19965daf
Former-commit-id: 7cbc9b4ef3
2013-11-13 10:52:07 -06:00
Brad Gonzales
25462e76ac 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: e2aa1fc62a [formerly 50fb18601c] [formerly 62e4cafa27] [formerly 62e4cafa27 [formerly 8f70fb1d0c]] [formerly aea0e847aa [formerly 62e4cafa27 [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 1eb187e9c46bd39ac3262a6fcee484349005c13f [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20] [formerly 7747d901f7 [formerly 866a11a9f0]]
Former-commit-id: 7747d901f7
Former-commit-id: 725742f4ec
2013-11-12 12:42:16 -06:00
Benjamin Phillippe
dfdff53f79 Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: a1abc1cab0 [formerly 8f30c4f79a] [formerly 0abf405014] [formerly 0abf405014 [formerly b84235a80a]] [formerly b5db1f38c3 [formerly 0abf405014 [formerly b84235a80a] [formerly b5db1f38c3 [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]]]]
Former-commit-id: b5db1f38c3
Former-commit-id: a8e6d6d36fda9327b6a97616cf0699dcb160023f [formerly def1eae12e1318c52624530ccfdebf9fcfcd782b] [formerly bd3e4778c0 [formerly 1a492a564b]]
Former-commit-id: bd3e4778c0
Former-commit-id: e5b40456ad
2013-11-07 18:36:46 -06:00
Benjamin Phillippe
e04b52cc71 Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b

Former-commit-id: f52497d05f [formerly bf7de26703] [formerly 0fa6977442] [formerly 0fa6977442 [formerly 08706e9a94]] [formerly 6a3fc6c059 [formerly 0fa6977442 [formerly 08706e9a94] [formerly 6a3fc6c059 [formerly 85e2b4a7717e24983b417a930402a8095d0c6021]]]]
Former-commit-id: 6a3fc6c059
Former-commit-id: d5abacb0f7ea9c97179b8ea0308c6062f0fe1d55 [formerly 38f8b3c5acc50c9c911e49d2ae3305899cd7d612] [formerly cafe62bf4c [formerly 7f37efd83a]]
Former-commit-id: cafe62bf4c
Former-commit-id: dfdbf93ab2
2013-11-05 10:50:47 -06:00
Richard Peter
3989dcdbea Merge "Issue #1538 Moved data delivery specific web services out of registry plugins -- Added registry federation admin page -- Made registry service clients non-static" into development
Former-commit-id: b29c29154f [formerly f2919db4e8] [formerly 311c749cb2] [formerly 311c749cb2 [formerly bed067dc4e]] [formerly 3d293fce88 [formerly 311c749cb2 [formerly bed067dc4e] [formerly 3d293fce88 [formerly 44665bcb3b4745532ce0febf26a6b5a000e1a0bc]]]]
Former-commit-id: 3d293fce88
Former-commit-id: bc47f365570c43d2f0e9dda66d68630db0568fa4 [formerly a6caa3d19afcbe528bd1125fdd02d97ed47dab15] [formerly b442f6c3fa [formerly c70e6f127b]]
Former-commit-id: b442f6c3fa
Former-commit-id: c2a0e9f6b1
2013-11-05 10:09:42 -06:00
Nate Jensen
02fc51a191 Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9

Former-commit-id: 41ee319e15 [formerly 37eaab4490] [formerly 2e28d72fb7] [formerly 2e28d72fb7 [formerly 2413c854c0]] [formerly 5efd1b7218 [formerly 2e28d72fb7 [formerly 2413c854c0] [formerly 5efd1b7218 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]]
Former-commit-id: 5efd1b7218
Former-commit-id: 7d7fb8cd5d9a5608533c343cde5746ff83839cf4 [formerly c4286e81e6c3ef5daac753ed4597591ab4297c22] [formerly 3753b45c0c [formerly f4cdcb2fae]]
Former-commit-id: 3753b45c0c
Former-commit-id: a9a4963f09
2013-11-01 12:09:43 -05:00
Benjamin Phillippe
2f601adfcb Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
            -- Made registry service clients non-static

Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad

Former-commit-id: 81991679b4 [formerly 311fa32377] [formerly 98b56cf02a] [formerly 98b56cf02a [formerly a7e53870fb]] [formerly d8de923f8b [formerly 98b56cf02a [formerly a7e53870fb] [formerly d8de923f8b [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]]
Former-commit-id: d8de923f8b
Former-commit-id: 8a1ff304ef4f59b4d1cabc8ee7e91b05a9ba4f42 [formerly 628fd3115dbabe88f9d202b5257352679e5c521b] [formerly 7cb19682c1 [formerly 221d197c01]]
Former-commit-id: 7cb19682c1
Former-commit-id: e9b49b288f
2013-11-01 09:20:00 -05:00
Richard Peter
ea97b85e83 Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 04769744f1 [formerly 767cbbf4f2] [formerly 5f1c6f5625] [formerly 5f1c6f5625 [formerly f75b431a40]] [formerly 89b992c01c [formerly 5f1c6f5625 [formerly f75b431a40] [formerly 89b992c01c [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]]
Former-commit-id: 89b992c01c
Former-commit-id: c59a84cd43036f954506ba2f29b9af6b97d7c052 [formerly e5e56997f9e05d9ac3a79690595406c220de7aa3] [formerly 66d7ccb859 [formerly c56806b9b7]]
Former-commit-id: 66d7ccb859
Former-commit-id: 4386e3b451
2013-10-29 12:17:14 -05:00
Bryan Kowal
bbaf9ffc28 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 6e8e0b1f55 [formerly 90a54524c6] [formerly df575b7be1] [formerly df575b7be1 [formerly a6d7822698]] [formerly cda8d04831 [formerly df575b7be1 [formerly a6d7822698] [formerly cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]]
Former-commit-id: cda8d04831
Former-commit-id: 271dcb3371cf5132105a895e1f570e8caae2e7dd [formerly 3fa0f0dac5587960c496629c316aa2a1a2f464bc] [formerly 27d2e33769 [formerly cc0f6832c9]]
Former-commit-id: 27d2e33769
Former-commit-id: 3e68d9aaac
2013-10-28 14:50:28 -05:00
Benjamin Phillippe
5c6c64e41d Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: 50b10427b5 [formerly 9a8c43a777] [formerly 127b5a3b70] [formerly 127b5a3b70 [formerly be09ba9fcf]] [formerly 0905d6ffdd [formerly 127b5a3b70 [formerly be09ba9fcf] [formerly 0905d6ffdd [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]]]
Former-commit-id: 0905d6ffdd
Former-commit-id: e43ade4b1c791e0d607ae801a1f9ca66ac01b7cb [formerly df866e1f5581eb7f04abe632e8f4bbc1bb498f33] [formerly a169585a0a [formerly 041ce07803]]
Former-commit-id: a169585a0a
Former-commit-id: 1664af6b9d
2013-10-24 11:51:11 -05:00
Richard Peter
93708bc953 Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: da44bd1164 [formerly 6d62f99937] [formerly 859dd8272d] [formerly 859dd8272d [formerly 5fc3956337]] [formerly 1750224476 [formerly 859dd8272d [formerly 5fc3956337] [formerly 1750224476 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]]]]
Former-commit-id: 1750224476
Former-commit-id: df7741ff64a4a868eeca1727299eb9e783429418 [formerly 2a01606c61164f3088d8d81dc3e051f71ec538b1] [formerly bf7a5b48b1 [formerly 383a774fad]]
Former-commit-id: bf7a5b48b1
Former-commit-id: 330a333933
2013-10-23 16:53:22 -05:00
Richard Peter
9ade076248 Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 7cd5ab2d3b [formerly 3cd286ba60] [formerly 2e7836431e] [formerly 2e7836431e [formerly 7ec76c0634]] [formerly 6b4c675600 [formerly 2e7836431e [formerly 7ec76c0634] [formerly 6b4c675600 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]]]
Former-commit-id: 6b4c675600
Former-commit-id: a4d17733ad4ac31a3ec929ab9c7771fbee00bc60 [formerly 97c05a8e322561ee200f9573a86e4869891f59bd] [formerly 3843947a17 [formerly 109474aec7]]
Former-commit-id: 3843947a17
Former-commit-id: a1eebaaf69
2013-10-23 16:41:57 -05:00
Benjamin Phillippe
6d64ead046 Issue #1682 Fixed registry query that prevented deletions of subscriptions
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

Former-commit-id: 7ab92de447 [formerly 142639abf7] [formerly 9f03f26ad6] [formerly 9f03f26ad6 [formerly 22c8ed7add]] [formerly 3a3fb00f78 [formerly 9f03f26ad6 [formerly 22c8ed7add] [formerly 3a3fb00f78 [formerly b3ef0276414f5009f79e55e3b08c58daeeb56e26]]]]
Former-commit-id: 3a3fb00f78
Former-commit-id: e276b25ff2e3d295a01f1e501deddc1b993a2f37 [formerly b4d42937ab7872a879f37d968df6b96635a96729] [formerly 7eadbf5175 [formerly c07e7fac10]]
Former-commit-id: 7eadbf5175
Former-commit-id: 2e77c00d1b
2013-10-23 13:03:25 -05:00
Benjamin Phillippe
8bd0f21ccd Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer
Change-Id: I2d22199f9e1e35b3425e294ce3884ebb9d2cc99f

Former-commit-id: 8d4720800a [formerly e697b3d9d3] [formerly 0400391864] [formerly 0400391864 [formerly cd55f3e328]] [formerly 68eeb03630 [formerly 0400391864 [formerly cd55f3e328] [formerly 68eeb03630 [formerly 18737abc6781a353b831d9c012cc293f60731f89]]]]
Former-commit-id: 68eeb03630
Former-commit-id: e431065d2448bb087e90253df827a66a41fd47cf [formerly adf849c746259a16325f2fd041da2d7418ca427d] [formerly c20c08dc73 [formerly 84d5c28331]]
Former-commit-id: c20c08dc73
Former-commit-id: 9e693c9c05
2013-10-23 11:05:38 -05:00
Benjamin Phillippe
3e1609da94 Issue #1538 Reworked registry database connection strategy
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: 0f8520cad3 [formerly cf109fea6b] [formerly 16cf053ba9] [formerly 16cf053ba9 [formerly b192fd81c4]] [formerly ef0d0e2393 [formerly 16cf053ba9 [formerly b192fd81c4] [formerly ef0d0e2393 [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]]]
Former-commit-id: ef0d0e2393
Former-commit-id: 34e96397935857292090905765db15a8522001d8 [formerly bb1aae881f66d72dc6ea40bef73dbcee83f6f04e] [formerly e2383dc624 [formerly 5aa04a9a43]]
Former-commit-id: e2383dc624
Former-commit-id: ff5a939ffa
2013-10-23 10:48:40 -05:00
Benjamin Phillippe
1ea00410ad Issue #1682 Fixed replication/query errors and added synchronous notification delivery
Change-Id: Ia6a07c3abf6c48ef18d354dc2866ed981e6f1478

Former-commit-id: df716f5b6a [formerly d0e72c91fc] [formerly c88eb406bf] [formerly c88eb406bf [formerly 64b0a4d065]] [formerly d94f22fda8 [formerly c88eb406bf [formerly 64b0a4d065] [formerly d94f22fda8 [formerly 2f6dc771e86cf290bb72743f1855f02c616e57d5]]]]
Former-commit-id: d94f22fda8
Former-commit-id: 4cb592f8419245f7a9050bb0ac2e8cef1dee31cf [formerly 5de22c44f318ece31c6105adf801e2c7d76a5903] [formerly 8c85c73660 [formerly 9153069a87]]
Former-commit-id: 8c85c73660
Former-commit-id: 69f8efc8d6
2013-10-20 16:02:10 -05:00
Benjamin Phillippe
ca4d08f317 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: 0c509b1966 [formerly 9bc1058db1] [formerly 12d23800c7] [formerly 12d23800c7 [formerly a4e5cd5fd7]] [formerly ed23a786d6 [formerly 12d23800c7 [formerly a4e5cd5fd7] [formerly ed23a786d6 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]]]
Former-commit-id: ed23a786d6
Former-commit-id: 97711a979c12fef5dc4bf10d176e5c781370a8d8 [formerly 0d452b3343313b1a38b897d43d2a6fef69eb7481] [formerly 11b9198589 [formerly a51d2fe3b9]]
Former-commit-id: 11b9198589
Former-commit-id: 40ccc490a4
2013-10-18 09:20:40 -05:00
Dave Hladky
a09f9a42ef Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: e94ce3d9ad [formerly e14b51258b] [formerly 7b6ef7ee9a] [formerly 7b6ef7ee9a [formerly 6076f46549]] [formerly 477fbd3d59 [formerly 7b6ef7ee9a [formerly 6076f46549] [formerly 477fbd3d59 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]]
Former-commit-id: 477fbd3d59
Former-commit-id: 3799f059099e8af8d375c284e173b9fb8575b67b [formerly a483ea67e7e78c9b17eaf6a48fb26ebec56271c3] [formerly 9880c82a36 [formerly 639019eff1]]
Former-commit-id: 9880c82a36
Former-commit-id: aa5fd1ba3f
2013-10-16 09:06:00 -05:00
Benjamin Phillippe
792d519ddf Issue #2385 Fixed subscription backup web page
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf

Former-commit-id: fd6c2b8045 [formerly 1a10852cbf] [formerly ce3e85e4d4] [formerly ce3e85e4d4 [formerly 2759456eb4]] [formerly 5e72b8fa2e [formerly ce3e85e4d4 [formerly 2759456eb4] [formerly 5e72b8fa2e [formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: ba5043dcf807cb69fb1662cb480c0612217e725b [formerly d30302cf9dd37231ec21ef2abe22da13e1537916] [formerly 4fef3dad20 [formerly 323d9f40da]]
Former-commit-id: 4fef3dad20
Former-commit-id: 1d645a975b
2013-10-07 09:52:47 -05:00
Benjamin Phillippe
f307bb2fb2 Issue #2191 Fixing Registry Federation
Change-Id: Ibf3dec6af45424bc8678a37f00b070d3032bb7de

Former-commit-id: dbb6f6deee [formerly f759853531] [formerly 1c9f237245] [formerly 1c9f237245 [formerly f76c747a01]] [formerly ac44137242 [formerly 1c9f237245 [formerly f76c747a01] [formerly ac44137242 [formerly 985d2d02c2191eadcba59af4b16ad3d7e15de6d6]]]]
Former-commit-id: ac44137242
Former-commit-id: 874573c9a182fc35344d8ec5de3852cb0bafe71f [formerly cdba9178e2b25b4e73d616be88130ca8a588122a] [formerly 83cbecc94e [formerly cc1c27ea93]]
Former-commit-id: 83cbecc94e
Former-commit-id: cf48f462fe
2013-09-30 10:16:03 -05:00
Benjamin Phillippe
f48197135f Issue #2385 Add capability to backup/restore data delivery subscriptions
Change-Id: I281dcf3259f3db50feabef40574bdb4487c95c7e

Former-commit-id: 5f2546e905 [formerly e683f2a8a8] [formerly 026820d513] [formerly 026820d513 [formerly 344dd71813]] [formerly 1d2b59c0a2 [formerly 026820d513 [formerly 344dd71813] [formerly 1d2b59c0a2 [formerly 7eb5c27fcbcd4fb52e9776e5ed2e6f16248922e1]]]]
Former-commit-id: 1d2b59c0a2
Former-commit-id: a20fdec510e99265f0bf3bf9b7e8a5ffcea1ffae [formerly ceb6685ccf99c27c81dc1cc8b3f384bba01aa9b1] [formerly aa797bcb2f [formerly 9c4e183f91]]
Former-commit-id: aa797bcb2f
Former-commit-id: 70a5cc1d34
2013-09-23 11:20:20 -05:00
Benjamin Phillippe
6d70a4f4a8 Issue #1705 Added support for registry object references
Change-Id: If489dcf41f02257ceb31bab1f5a917c3e6884252

Former-commit-id: b8b5e12007 [formerly afdf864f94] [formerly 40f64feb63] [formerly 40f64feb63 [formerly 6fd5f4a8a8]] [formerly df32d5e2e3 [formerly 40f64feb63 [formerly 6fd5f4a8a8] [formerly df32d5e2e3 [formerly a1b3a525cafd0759dfed9a387f74649bb4a3a765]]]]
Former-commit-id: df32d5e2e3
Former-commit-id: 39900347af46e1ccb85bec3e89e52bb8b1f83f0c [formerly 5282b922c08cee247c5ee5a0fc3d92530c912c43] [formerly c8930973da [formerly 79631f88f8]]
Former-commit-id: c8930973da
Former-commit-id: 5c07b41ea5
2013-09-18 10:58:54 -05:00
Benjamin Phillippe
c0e3836833 Issue #1695 Minor fix to update objects in LifecycleManager
Change-Id: I56fbc283f560d38aa5392845060050ee7264e2da

Former-commit-id: b0791ee8a9 [formerly fc836ea9ef] [formerly e19817e9e1] [formerly e19817e9e1 [formerly 6356110226]] [formerly fdd6e67a48 [formerly e19817e9e1 [formerly 6356110226] [formerly fdd6e67a48 [formerly de0c63581e75c16445d8fd87aca5be594f7732aa]]]]
Former-commit-id: fdd6e67a48
Former-commit-id: 4cff64597567be2de63861007d366b84bc77d7d7 [formerly 83f00ce303ef54dccf676ff5a671c7dc16baace3] [formerly 0ba44c3e92 [formerly 4a5d7da67e]]
Former-commit-id: 0ba44c3e92
Former-commit-id: c2e71b5292
2013-09-17 10:52:45 -05:00
Benjamin Phillippe
ea792dc648 Issue #2354 Fixed replication of deleted objects
Change-Id: Ibe9d3ca094d90fdef7ecf2a317f362f2d2ba90a9

Former-commit-id: 637818ec77 [formerly 31897fc984] [formerly 4a174edcbb] [formerly 59139fd26e24744f7371317713ebcabaa2158356 [formerly 4a174edcbb [formerly 469710c1bb]]] [formerly 7296b3071f [formerly 4a174edcbb [formerly 469710c1bb] [formerly 7296b3071f [formerly 8a7d76cb892102a2d7f972bca128e9186f442fd7]]]]
Former-commit-id: 7296b3071f
Former-commit-id: d62e6736fc117f05f3ee82a8de8b00548a77df9e [formerly 3231b824f640eab628b5ae4b2d976bbcd5ff8ec0] [formerly 50b3d4837b [formerly e77dc1d29a]]
Former-commit-id: 50b3d4837b
Former-commit-id: e2850b42b4
2013-09-12 13:30:31 -05:00
Benjamin Phillippe
b7fee7ea63 Issue #1538 Registry Replication cleanup and fixes
Change-Id: I03c4cd01926f648b580712de890a8d914bc3881a

Former-commit-id: c7c4cdd779 [formerly 009775f5ec] [formerly 7f80189061] [formerly 7f80189061 [formerly 087d2b72b1]] [formerly 6dd84eebf2 [formerly 7f80189061 [formerly 087d2b72b1] [formerly 6dd84eebf2 [formerly 6fb985176f89600f096f86f3094ebdd49d63f442]]]]
Former-commit-id: 6dd84eebf2
Former-commit-id: 0da2ef8a421ee3c259586db119816b76f701efe8 [formerly e39e5be2db82abee533f72ad64049633a2d288f0] [formerly b67a72e688 [formerly 0686b22c0a]]
Former-commit-id: b67a72e688
Former-commit-id: 2531aa1c1f
2013-09-05 16:20:46 -05:00
Dave Hladky
e71d901dcd Issue #2098 Updates for WFS/DPA improvements
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf

Former-commit-id: 6043dd40ef [formerly 077483ac8d] [formerly 24a3c8b24b] [formerly 24a3c8b24b [formerly 0a45c77520]] [formerly ac4aeeec45 [formerly 24a3c8b24b [formerly 0a45c77520] [formerly ac4aeeec45 [formerly dc668631168388501efb8753ecb4cff8b9025456]]]]
Former-commit-id: ac4aeeec45
Former-commit-id: a83715a0ebd2df98ad73af1726aceece63aa3ea7 [formerly 5137d7223b27c55203fb556e742da0b258a5b687] [formerly 02c9778ff6 [formerly 36005754b5]]
Former-commit-id: 02c9778ff6
Former-commit-id: c6667a985b
2013-08-30 12:57:31 -05:00
Benjamin Phillippe
d77c74b87b Issue #1538 Federated registry fixes/modifications
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146

Former-commit-id: 4cc3b75e17 [formerly 2b6aca163f] [formerly 178e073cf3] [formerly 178e073cf3 [formerly a96764e900]] [formerly b10ecfa19c [formerly 178e073cf3 [formerly a96764e900] [formerly b10ecfa19c [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]]]]
Former-commit-id: b10ecfa19c
Former-commit-id: cd6e436ce63078c86cabb53a57bd0706d93e8772 [formerly e00dac430e9e5ef681cf84ca23ae6d1f181901e0] [formerly 117374dbef [formerly 283326197a]]
Former-commit-id: 117374dbef
Former-commit-id: 4e0dc57681
2013-08-28 11:41:06 -05:00
Benjamin Phillippe
c997b0d115 Issue #1693 Fixing dependencies
Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9

Former-commit-id: d53e730da9 [formerly de11fc45b9] [formerly eebb355e81] [formerly eebb355e81 [formerly 0d8adcade1]] [formerly 2f0949aa0a [formerly eebb355e81 [formerly 0d8adcade1] [formerly 2f0949aa0a [formerly 73c647449e071c9290c7b7fa57e99490960be536]]]]
Former-commit-id: 2f0949aa0a
Former-commit-id: 92fdb8fb4fd6138ea8497ce6889cbd7b70d8495c [formerly 89aadc836192621ada769d9a7110d29964dbdcb0] [formerly 93b1969f05 [formerly 1561652425]]
Former-commit-id: 93b1969f05
Former-commit-id: f467102072
2013-08-21 16:28:49 -05:00
Benjamin Phillippe
2825b0c091 Issue #1692 Implemented/Verified Registry LifecycleManager
- Verified submitObjects protocol
            - Added unimplemented features of removeObjects protocol
            - Implemented updateObjects protocol
            - Refactored registry error reporting
            - Fixed JUnit tests
            - Corrected @XmlRootElement tag on registry objects
            - Added capability to modify registry objects using XPath

Change-Id: Id8eea47c3c4a1e39fe88cb17530e9e6cdacd7ce2

Former-commit-id: 32bf9e8d1e [formerly afddfc35e5] [formerly fcd42b5869] [formerly fcd42b5869 [formerly 2403f75262]] [formerly 1390bd8a65 [formerly fcd42b5869 [formerly 2403f75262] [formerly 1390bd8a65 [formerly 94810246b449c64457c48684df72baf6e9e8b03d]]]]
Former-commit-id: 1390bd8a65
Former-commit-id: 747803e58cacc01a572c34b6cef94ab1977d4cfe [formerly 79784b1b6e6437fbfc1c16e804a6e73a6d884797] [formerly d98fbd79c7 [formerly d9dffafa6f]]
Former-commit-id: d98fbd79c7
Former-commit-id: 8dc4f54610
2013-08-19 13:16:13 -05:00
Benjamin Phillippe
dd142e5815 Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: fd0252c440 [formerly 00cb6b91da] [formerly a7258dd8f6] [formerly a7258dd8f6 [formerly 59a9aeabf0]] [formerly 3c7ad386ed [formerly a7258dd8f6 [formerly 59a9aeabf0] [formerly 3c7ad386ed [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]]]
Former-commit-id: 3c7ad386ed
Former-commit-id: 7267ce760402b33b522ed788513c9e8cecf91227 [formerly 434e7062b12ec6246bd87fa9773f317f741ec433] [formerly 2c2ed655aa [formerly dc2e0f6a7b]]
Former-commit-id: 2c2ed655aa
Former-commit-id: f14971f554
2013-08-08 09:56:35 -05:00
Benjamin Phillippe
4aa7d1dc65 Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: e9847daadf [formerly 065a80e21f] [formerly 01466d0624] [formerly 01466d0624 [formerly 73fd5ac852]] [formerly 5bd0d92363 [formerly 01466d0624 [formerly 73fd5ac852] [formerly 5bd0d92363 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]]
Former-commit-id: 5bd0d92363
Former-commit-id: 3e6a5172e04f0cbf0dbfd61d148ed95041b8a460 [formerly 797d497319dc73d802f575a9b6766863f551e648] [formerly 972d02114c [formerly 33f601b72e]]
Former-commit-id: 972d02114c
Former-commit-id: a3b8e6ff24
2013-08-06 11:13:01 -05:00
Richard Peter
c01fa23f2d Merge "Issue #2191 Registry federation synchronization and garbage collection" into development
Former-commit-id: 3c08541df7 [formerly 7c26c9e7a6] [formerly 22f8248332] [formerly 22f8248332 [formerly e692cc245b]] [formerly 137bb556ee [formerly 22f8248332 [formerly e692cc245b] [formerly 137bb556ee [formerly 4e3f429e5aebec59e5c15c8bea062cc62e599cc6]]]]
Former-commit-id: 137bb556ee
Former-commit-id: 542674000e182990ef84d688c6d6b9220e34ad34 [formerly a312d2291318cf1c45a4d559b0f1771bde29cc02] [formerly f348aadcd4 [formerly 549ffd000c]]
Former-commit-id: f348aadcd4
Former-commit-id: 4b028df1b9
2013-08-02 14:44:16 -05:00