Benjamin Phillippe
d7c1c5805f
Omaha #3718 Restored data delivery subscription backup web page
...
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: 825aa0d5b2
[formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]
Former-commit-id: df6b3b3832
2014-10-10 10:59:16 -05:00
Max Schenkelberg
7cfc26d1d7
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
...
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: 63967fbc78
[formerly 3aff99e787a7368f40cdd161581ead2d3552118c]
Former-commit-id: 78b87b7a63
2014-08-26 11:32:20 -05:00
Richard Peter
eafe010aa1
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
...
Former-commit-id: 5cce505b7f
[formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]
Former-commit-id: 651a10715a
2014-08-25 20:43:28 -05:00
Max Schenkelberg
68221174c4
Omaha #3541 Updated A2 baseline to reflect request service split
...
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 896e353950
[formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]
Former-commit-id: e90bdb6fce
2014-08-22 13:15:42 -05:00
Benjamin Phillippe
f8ee1ce801
Omaha #3509 Fixed XACML processing to work properly with DPA
...
Change-Id: I6b66cfe4217c8a9bc2dec1d7e97b7f5203b518fe
Former-commit-id: 201962c6fc
[formerly 4661d8ec3ed187b2ccf270a2acbcd55cc5ef359c]
Former-commit-id: 02719e9f90
2014-08-20 09:30:16 -05:00
Nate Jensen
84e1265370
Omaha #3356 move EbxmlNamespaces and RegrepUtil to unique package name
...
to allow removal of duplicate package name of com.raytheon.uf.common.registry
Change-Id: I502e14e8c729d606f6122aa969eef7d8761181c4
Former-commit-id: 83b666c0df
[formerly 9adcbd81d10aa3d464d6dcb0b79b7500f0796cbd]
Former-commit-id: 1d3047f3d8
2014-08-15 15:54:08 -05:00
Benjamin Phillippe
6451d53be7
Omaha #3509 Minor fixes to custom XACML policy processing
...
Former-commit-id: 085c6407d5
[formerly 21efa23f4c1236e874312c03a60f5c6dc2bd0c9a]
Former-commit-id: ca6c4093b7
2014-08-13 11:09:30 -05:00
Benjamin Phillippe
26c6571bc3
Omaha #3509 Aded support for custom XACML policies
...
Change-Id: I37c0aac34cbcc30be2a48876cef27cdf97c35a33
Former-commit-id: 1410dc479e
[formerly 1b1cd7789f835fd73dbc0d939df03f6417600154]
Former-commit-id: e9c310b4d8
2014-08-12 10:31:49 -05:00
Nathan Bowler
0a0daa69a7
Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14
...
Change-Id: Ie3d5e557e4a748ad80202006ccecfb6388612e10
Former-commit-id: 3f2c4818d9
[formerly 661677010f27b455c19677d22a27f42e3dba184e]
Former-commit-id: 2cede8a84f
2014-08-06 14:41:01 -04:00
Dave Hladky
8d3ba6585a
Omaha #3474 AWIPS2-Development portion of DD #2752
...
Former-commit-id: 944637a144
[formerly 053a656621ac0b6fb5dfd07b66c3440f61bd7136]
Former-commit-id: c6f5e8f6b1
2014-07-30 14:57:41 -05:00
Benjamin Phillippe
c609d4fd88
Omaha #3255 Fixing dependencies to fix the DPA
...
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9
Former-commit-id: a19c9c1243
[formerly 075bb856689e8eaa95ee7721b6270c3a785c9bd4]
Former-commit-id: 81997a24cc
2014-07-24 11:27:27 -05:00
Greg Armendariz
a6133db8d2
Merge branch 'omaha_15.1.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
Former-commit-id: f12b1a1098
[formerly 111178b736cc4e894f59bc7127ec2bddda96264c]
Former-commit-id: 8773e17083
2014-07-21 12:12:32 -05:00
Greg Armendariz
fcf1b5ee8a
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: b34486973e
[formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]
Former-commit-id: 09f6bd471c
2014-07-17 15:41:38 -05:00
Benjamin Phillippe
576e2eb0f8
Omaha #3350 Added user/role authentication. Added XACML authorization
...
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df
Former-commit-id: cebfbebea6
[formerly 81d0249971d4004067b6aef672e00417ddb83b36]
Former-commit-id: 6cb73e63a1
2014-07-16 10:49:24 -05:00
Benjamin Phillippe
06e73cd55f
Omaha #3379 Removing DWR
...
Former-commit-id: d110e8428b
[formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]
Former-commit-id: 4e1d93abf8
2014-07-11 11:56:44 -05:00
Benjamin Phillippe
29f98ed5ab
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: ba0472caad
[formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]
Former-commit-id: 7960578e2c
2014-07-03 12:53:22 -05:00
Dave Hladky
aa507be41e
Omaha #2760 Made external JMS route for registry events
...
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6
Former-commit-id: 5556e447e6
[formerly 22e51bc1f882c535c7bafcdfd84428700eb6e547]
Former-commit-id: 0d1767a3d7
2014-06-27 10:04:17 -05:00
Dave Hladky
bc75b00731
Omaha #3273 Remove all reference off DD env variables from setup.env
...
Former-commit-id: f2b4bcfef1
[formerly 0ad525e949fc9cf9390909128b4c590034f00963]
Former-commit-id: dbf301b8c4
2014-06-26 09:46:31 -05:00
Dave Hladky
df958f67c5
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: c6a1a5592c
[formerly 9061033cd5f8299435b5aa83410e2d99f477d07e]
Former-commit-id: 47cc398e91
2014-06-23 13:03:25 -05:00
Benjamin Phillippe
447fb0572a
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: 270caaadde
[formerly dbac62df979f23402594dc6439b53e7884ea1bd1]
Former-commit-id: c2ed8a39d1
2014-06-18 09:54:40 -05:00
Nate Jensen
ec83717594
Omaha #3255 attempt to fix build
...
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25
Former-commit-id: bc48674092
[formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]
Former-commit-id: 3c57231c82
2014-06-17 08:42:29 -05:00
Nate Jensen
9cd933cc7b
Omaha #3255 fix build
...
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46
Former-commit-id: a8bae916f3
[formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]
Former-commit-id: c65c392d63
2014-06-17 07:40:18 -05:00
Benjamin Phillippe
c523752519
Omaha #3255 Registry Security Features (commit 1/5)
...
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291
Former-commit-id: cfe7bb251f
[formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]
Former-commit-id: fb9e936e0e
2014-06-12 11:26:51 -05:00
Nate Jensen
b2620a57be
Omaha #3211 fix data delivery modes
...
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e
Former-commit-id: cd7e1a4665
[formerly 630f2fab4c3c37fd05eb9f92d14c11cf761d9477]
Former-commit-id: 08c5c75035
2014-06-09 14:34:18 -05:00
Richard Peter
220f7aa97a
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
...
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 558699a370
[formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]
Former-commit-id: e2288769d3
2014-05-29 15:50:59 -05:00
Brian Clements
14a50e4c3d
Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
...
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de
Former-commit-id: fb71fae2d1
[formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]
Former-commit-id: 5abe7ea99d
2014-05-29 11:58:10 -05:00
Brian Clements
fd9f98b2ba
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: f9de79465a
[formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]
Former-commit-id: c875f17719
2014-05-22 14:09:07 -05:00
Dave Hladky
7611339cd8
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 333bf8b36d
[formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]
Former-commit-id: ccaaa1cfea
2014-05-05 12:15:14 -05:00
Dave Hladky
bf42c8d740
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]
Former-commit-id: 3b00ae03cc
2014-04-30 17:38:28 -05:00
Brian.Dyke
8160209e52
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 278aab6b6f
[formerly 64c3766ed570885a796f846b889d40413e8250c6]
Former-commit-id: 63137ed69c
2014-04-30 12:57:09 -04:00
Richard Peter
80d4153878
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 44b1782461
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 32957285fc
2014-04-28 16:27:40 -05:00
Brian.Dyke
029f5753ad
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: fb1f5aa593
[formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: 3524838f9f
2014-04-25 11:06:11 -04:00
Richard Peter
a526ae0370
Issue #2928 : Update DD WebContainer to allow loading properties from environment
...
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081
Former-commit-id: c74786c35c
[formerly 119282c58744addb3fd1a5c4a1a165f98d6437a8]
Former-commit-id: 2f8da547ea
2014-04-23 16:01:40 -05:00
Richard Peter
0938c4314f
Issue #2928 : Add default byte limit, set registry byte limit
...
Change-Id: I31f6687b30f501a30f78d4b289059d2de19528f6
Former-commit-id: 4f0b83a12e
[formerly e32d44051831d9b587ab398a19eb5afe7b7b5c58]
Former-commit-id: 341e8331db
2014-04-22 15:08:18 -05:00
Dave Hladky
ae84d2991e
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 61fc2fea51
[formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]
Former-commit-id: 45059e722a
2014-04-21 12:26:47 -05:00
Benjamin Phillippe
d8408a9b3f
Issue #3011 Fixed slot cleanup
...
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b2686e46cf
[formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]
Former-commit-id: b86fae838f
2014-04-18 15:10:46 -05:00
Benjamin Phillippe
035272360b
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 3db751fc5b
[formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]
Former-commit-id: 62062bf288
2014-04-15 09:15:12 -05:00
Richard Peter
8b279966d1
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: dbba727f3d
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]
Former-commit-id: 17196b5dcd
2014-04-14 13:10:11 -05:00
Dave Hladky
f26450c40d
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: 1671baaf10
[formerly adc364d92a7fcb2a255a2f448efb56ef48492280]
Former-commit-id: 9479219b73
2014-04-02 14:06:25 -05:00
Steve Harris
7fbbc1e118
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 8b6263bfbd
[formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]
Former-commit-id: 1c64a5c025
2014-03-06 18:31:10 -06:00
Benjamin Phillippe
15a5e7c4a4
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: ed050996a2
[formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]
Former-commit-id: 5483d6d7ae
2014-03-03 10:57:16 -06:00
Richard Peter
f13c86bc3e
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: 0e25ae35c1
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 1c150e6e8b
2014-02-27 15:18:26 -06:00
Dave Hladky
ff5a5961db
Issue #2469 Fixed default rules implementation
...
Former-commit-id: 1d256bfcee
[formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]
Former-commit-id: 45413d0db4
2014-02-24 13:06:52 -06:00
Benjamin Phillippe
cdaa7e32b4
Issue #2769 Removed aggressive Hibernate session flushes
...
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216
Former-commit-id: 1691c5a3ff
[formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]
Former-commit-id: fc589ed84d
2014-02-04 10:24:11 -06:00
Steve Harris
1fd5b2255f
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: 1738185503
[formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]
Former-commit-id: 1aea63a1f6
2014-01-29 09:41:57 -06:00
Dave Hladky
dccf640640
Issue #2584 Step one of versioning for DD
...
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00
Former-commit-id: 523e100fd0
[formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]
Former-commit-id: 690b5b73cf
2014-01-24 14:44:12 -06:00
Benjamin Phillippe
c82b289e2d
Issue #2613 Registry performance enhancements. Better handling of delete events.
...
Change-Id: I56d3f5c37778e717810b6a698ec9405ed3cde00a
Former-commit-id: b53a0b258d
[formerly f863897fd512acae11364eb6b4737339b5951da0]
Former-commit-id: 95b0f12880
2014-01-21 15:02:59 -06:00
Steve Harris
252c7ee40a
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: 24ab7cff49
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]
Former-commit-id: 69dc3d835b
2014-01-21 12:36:54 -06:00
Benjamin Phillippe
407687aeb3
Issue #2613 Rewrote poorly written section of code in NotificationListenerImpl
...
Change-Id: Ibcdd415667f379a20799a4166b12cc8cc5e05ed4
Former-commit-id: 6b0d25cf5c
[formerly 4d4c7837ad1084b8c6007c660c59e3bd29f757cc]
Former-commit-id: 7516310ab1
2014-01-17 12:07:34 -06:00
Dave Hladky
f7b5ce629a
Issue #2613 StandardCharsets NIO dependency removed.
...
Change-Id: I7ba841e1f1e480561d3c7302e8b00ecfaab41f24
Former-commit-id: c342681a0b
[formerly a9e1fbf4f19beecc2935cb992380f27cb2298ddb]
Former-commit-id: 33aeec0cb4
2014-01-16 09:21:35 -06:00