Nate Jensen
|
0bb18f02d0
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0] [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039]
Former-commit-id: e53063661e
|
2014-12-03 15:47:10 -06:00 |
|
Steve Harris
|
283ccdfa13
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: f4fc695a4d [formerly b5377ec6f1] [formerly f4fc695a4d [formerly b5377ec6f1] [formerly 7ddf027412 [formerly 1cbff6bc3dd08f5123e8ad052ad89e548ee63578]]]
Former-commit-id: 7ddf027412
Former-commit-id: 15c6bce647 [formerly 27f39e0c28]
Former-commit-id: e1ee6c563a
|
2014-10-23 08:47:06 -05:00 |
|
Benjamin Phillippe
|
008b23be1e
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f] [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: fdd16051e8
Former-commit-id: a8ef477042 [formerly 5eec33b078]
Former-commit-id: 3808c125b9
|
2014-10-20 12:42:19 -05:00 |
|
Steve Harris
|
27d75ed5cf
|
Merge branch 'omaha_14.4.1' into omaha_pda
Conflicts:
cave/com.raytheon.viz.feature.awips.developer/feature.xml
Former-commit-id: 716c1c8dae [formerly 4535f432ce] [formerly 716c1c8dae [formerly 4535f432ce] [formerly dafec4c8fe [formerly f2c656a4fe6d4b82f691e10d8dc49dcbbcff5adc]]]
Former-commit-id: dafec4c8fe
Former-commit-id: 46d475cc45 [formerly 0a6f1170fe]
Former-commit-id: d42d3aa991
|
2014-10-16 13:40:43 -05:00 |
|
Benjamin Phillippe
|
ad58fdbb57
|
Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: a7d5db57d8 [formerly 825aa0d5b2] [formerly a7d5db57d8 [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]
Former-commit-id: df6b3b3832
Former-commit-id: 48f13629a7 [formerly d7c1c5805f]
Former-commit-id: e2ec6c4a0b
|
2014-10-10 10:59:16 -05:00 |
|
Steve Harris
|
e5089db234
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 20c01c75f9 [formerly c82bf0de9b] [formerly 20c01c75f9 [formerly c82bf0de9b] [formerly 178618e752 [formerly 452239ce3f7124c35bfc117a5228c1a20967ae9a]]]
Former-commit-id: 178618e752
Former-commit-id: a943421fe0 [formerly f813d6efdc]
Former-commit-id: 6596fed771
|
2014-08-27 09:57:52 -05:00 |
|
Max Schenkelberg
|
0368097265
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: dacc10bcbc [formerly 63967fbc78] [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 0a7a2fadec [formerly 7cfc26d1d7]
Former-commit-id: 9048064741
|
2014-08-26 11:32:20 -05:00 |
|
Richard Peter
|
147856f43d
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 64848acf9d [formerly 5cce505b7f] [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]
Former-commit-id: 651a10715a
Former-commit-id: 0992358153 [formerly eafe010aa1]
Former-commit-id: ac192a5d86
|
2014-08-25 20:43:28 -05:00 |
|
Max Schenkelberg
|
395dcaa255
|
Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 88ea402947 [formerly 896e353950] [formerly 88ea402947 [formerly 896e353950] [formerly e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]
Former-commit-id: e90bdb6fce
Former-commit-id: ee4d9a965c [formerly 68221174c4]
Former-commit-id: e864d8a275
|
2014-08-22 13:15:42 -05:00 |
|
Dave Hladky
|
eb221edaf0
|
Omaha #3403 Changed BoundingBoxUtil to accomodate CSW updates for PDA
Change-Id: Ia26235017d4f6c860a49e40eae210a94e9385c97
Former-commit-id: ba60e36674 [formerly 76d6ce277e] [formerly ba60e36674 [formerly 76d6ce277e] [formerly 8ea42556f4 [formerly b0b596cb03ff44ccbd9a3d0347721bb2fac9c7e6]]]
Former-commit-id: 8ea42556f4
Former-commit-id: a96dece006 [formerly a093a1ae86]
Former-commit-id: 14ab75afc7
|
2014-08-20 14:35:32 -05:00 |
|
Benjamin Phillippe
|
b56bf7055a
|
Omaha #3509 Fixed XACML processing to work properly with DPA
Change-Id: I6b66cfe4217c8a9bc2dec1d7e97b7f5203b518fe
Former-commit-id: defe9d1c42 [formerly 201962c6fc] [formerly defe9d1c42 [formerly 201962c6fc] [formerly 02719e9f90 [formerly 4661d8ec3ed187b2ccf270a2acbcd55cc5ef359c]]]
Former-commit-id: 02719e9f90
Former-commit-id: 3e1b3f180c [formerly f8ee1ce801]
Former-commit-id: b8c4bb918e
|
2014-08-20 09:30:16 -05:00 |
|
Nate Jensen
|
fb4c498c2e
|
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: c612ca234c [formerly 83b666c0df] [formerly c612ca234c [formerly 83b666c0df] [formerly 1d3047f3d8 [formerly 9adcbd81d10aa3d464d6dcb0b79b7500f0796cbd]]]
Former-commit-id: 1d3047f3d8
Former-commit-id: af101e7bb6 [formerly 84e1265370]
Former-commit-id: 4f5ce115d2
|
2014-08-15 15:54:08 -05:00 |
|
Benjamin Phillippe
|
61868189bc
|
Omaha #3509 Minor fixes to custom XACML policy processing
Former-commit-id: f4cb4304e3 [formerly 085c6407d5] [formerly f4cb4304e3 [formerly 085c6407d5] [formerly ca6c4093b7 [formerly 21efa23f4c1236e874312c03a60f5c6dc2bd0c9a]]]
Former-commit-id: ca6c4093b7
Former-commit-id: 191c9db0be [formerly 6451d53be7]
Former-commit-id: b9e474e1a6
|
2014-08-13 11:09:30 -05:00 |
|
Benjamin Phillippe
|
124f7429ad
|
Omaha #3509 Aded support for custom XACML policies
Change-Id: I37c0aac34cbcc30be2a48876cef27cdf97c35a33
Former-commit-id: b68b812dbc [formerly 1410dc479e] [formerly b68b812dbc [formerly 1410dc479e] [formerly e9c310b4d8 [formerly 1b1cd7789f835fd73dbc0d939df03f6417600154]]]
Former-commit-id: e9c310b4d8
Former-commit-id: 4d0be5a4a7 [formerly 26c6571bc3]
Former-commit-id: 3c49e1c336
|
2014-08-12 10:31:49 -05:00 |
|
Nathan Bowler
|
35de01a191
|
Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14
Change-Id: Ie3d5e557e4a748ad80202006ccecfb6388612e10
Former-commit-id: a2dc4559dd [formerly 3f2c4818d9] [formerly a2dc4559dd [formerly 3f2c4818d9] [formerly 2cede8a84f [formerly 661677010f27b455c19677d22a27f42e3dba184e]]]
Former-commit-id: 2cede8a84f
Former-commit-id: 3f1ccc0de6 [formerly 0a0daa69a7]
Former-commit-id: 525427b631
|
2014-08-06 14:41:01 -04:00 |
|
Dave Hladky
|
aa5a1b773b
|
Omaha #3474 AWIPS2-Development portion of DD #2752
Former-commit-id: a9f1b748f4 [formerly 944637a144] [formerly a9f1b748f4 [formerly 944637a144] [formerly c6f5e8f6b1 [formerly 053a656621ac0b6fb5dfd07b66c3440f61bd7136]]]
Former-commit-id: c6f5e8f6b1
Former-commit-id: 9f4bf10bb1 [formerly 8d3ba6585a]
Former-commit-id: 7232040b9b
|
2014-07-30 14:57:41 -05:00 |
|
Benjamin Phillippe
|
eeefc62bf1
|
Omaha #3255 Fixing dependencies to fix the DPA
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9
Former-commit-id: 29c5dbe30a [formerly a19c9c1243] [formerly 29c5dbe30a [formerly a19c9c1243] [formerly 81997a24cc [formerly 075bb856689e8eaa95ee7721b6270c3a785c9bd4]]]
Former-commit-id: 81997a24cc
Former-commit-id: 85ad8d5e7d [formerly c609d4fd88]
Former-commit-id: ea6353ff2e
|
2014-07-24 11:27:27 -05:00 |
|
Greg Armendariz
|
e1180e770a
|
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: e5919e105b [formerly f12b1a1098] [formerly e5919e105b [formerly f12b1a1098] [formerly 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]]
Former-commit-id: 8773e17083
Former-commit-id: 49bd932339 [formerly a6133db8d2]
Former-commit-id: ec12c703fe
|
2014-07-21 12:12:32 -05:00 |
|
Greg Armendariz
|
88fe72c588
|
Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: e3f927e52c [formerly b34486973e] [formerly e3f927e52c [formerly b34486973e] [formerly 09f6bd471c [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]
Former-commit-id: 09f6bd471c
Former-commit-id: d51ab07c0e [formerly fcf1b5ee8a]
Former-commit-id: 5c5ab0f36c
|
2014-07-17 15:41:38 -05:00 |
|
Benjamin Phillippe
|
ec91eaed8f
|
Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df
Former-commit-id: d4997f5a90 [formerly cebfbebea6] [formerly d4997f5a90 [formerly cebfbebea6] [formerly 6cb73e63a1 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]]
Former-commit-id: 6cb73e63a1
Former-commit-id: 6959bdcdb2 [formerly 576e2eb0f8]
Former-commit-id: b0ddc103a7
|
2014-07-16 10:49:24 -05:00 |
|
Benjamin Phillippe
|
0c80abcc15
|
Omaha #3379 Removing DWR
Former-commit-id: cc9e9b427a [formerly d110e8428b] [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 5eea012728 [formerly 06e73cd55f]
Former-commit-id: 11a8186cbc
|
2014-07-11 11:56:44 -05:00 |
|
Benjamin Phillippe
|
9058a06b0e
|
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
Former-commit-id: c6c2f9240e [formerly ba0472caad] [formerly c6c2f9240e [formerly ba0472caad] [formerly 7960578e2c [formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]
Former-commit-id: 7960578e2c
Former-commit-id: 600a6c245a [formerly 29f98ed5ab]
Former-commit-id: eaf031c3dd
|
2014-07-03 12:53:22 -05:00 |
|
Dave Hladky
|
963c1e9831
|
Omaha #2760 Made external JMS route for registry events
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6
Former-commit-id: 445ddc86a5 [formerly 5556e447e6] [formerly 445ddc86a5 [formerly 5556e447e6] [formerly 0d1767a3d7 [formerly 22e51bc1f882c535c7bafcdfd84428700eb6e547]]]
Former-commit-id: 0d1767a3d7
Former-commit-id: 891aba68a8 [formerly aa507be41e]
Former-commit-id: 9ca81064df
|
2014-06-27 10:04:17 -05:00 |
|
Dave Hladky
|
dce9962e54
|
Omaha #3273 Remove all reference off DD env variables from setup.env
Former-commit-id: b9c930dd14 [formerly f2b4bcfef1] [formerly b9c930dd14 [formerly f2b4bcfef1] [formerly dbf301b8c4 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]]]
Former-commit-id: dbf301b8c4
Former-commit-id: 537a57784c [formerly bc75b00731]
Former-commit-id: f67bd17c03
|
2014-06-26 09:46:31 -05:00 |
|
Dave Hladky
|
68ad68a6f5
|
Omaha #3306 Made DPA SSL comms work
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 67d1468c8c [formerly c6a1a5592c] [formerly 67d1468c8c [formerly c6a1a5592c] [formerly 47cc398e91 [formerly 9061033cd5f8299435b5aa83410e2d99f477d07e]]]
Former-commit-id: 47cc398e91
Former-commit-id: 05360ecd9f [formerly df958f67c5]
Former-commit-id: 3c48f43e37
|
2014-06-23 13:03:25 -05:00 |
|
Benjamin Phillippe
|
a8d99c348d
|
Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: b41f79658f [formerly 270caaadde] [formerly b41f79658f [formerly 270caaadde] [formerly c2ed8a39d1 [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 38abcb36f5 [formerly 447fb0572a]
Former-commit-id: 5d908f2288
|
2014-06-18 09:54:40 -05:00 |
|
Nate Jensen
|
e699c6e40e
|
Omaha #3255 attempt to fix build
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25
Former-commit-id: 985c88d38b [formerly bc48674092] [formerly 985c88d38b [formerly bc48674092] [formerly 3c57231c82 [formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]]]
Former-commit-id: 3c57231c82
Former-commit-id: f2424f843e [formerly ec83717594]
Former-commit-id: 9a7e51f8b2
|
2014-06-17 08:42:29 -05:00 |
|
Nate Jensen
|
dde3272ecb
|
Omaha #3255 fix build
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46
Former-commit-id: 4fd29b211a [formerly a8bae916f3] [formerly 4fd29b211a [formerly a8bae916f3] [formerly c65c392d63 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]]]
Former-commit-id: c65c392d63
Former-commit-id: 47907b7dcd [formerly 9cd933cc7b]
Former-commit-id: 22b353ee4e
|
2014-06-17 07:40:18 -05:00 |
|
Benjamin Phillippe
|
55f7eabc96
|
Omaha #3255 Registry Security Features (commit 1/5)
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291
Former-commit-id: e05f09bb20 [formerly cfe7bb251f] [formerly e05f09bb20 [formerly cfe7bb251f] [formerly fb9e936e0e [formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]]]
Former-commit-id: fb9e936e0e
Former-commit-id: d46a6df3e0 [formerly c523752519]
Former-commit-id: 31aeb53f7c
|
2014-06-12 11:26:51 -05:00 |
|
Nate Jensen
|
bb716bceb2
|
Omaha #3211 fix data delivery modes
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e
Former-commit-id: 9666b22375 [formerly cd7e1a4665] [formerly 9666b22375 [formerly cd7e1a4665] [formerly 08c5c75035 [formerly 630f2fab4c3c37fd05eb9f92d14c11cf761d9477]]]
Former-commit-id: 08c5c75035
Former-commit-id: 9edf6426ce [formerly b2620a57be]
Former-commit-id: d7bd014bb9
|
2014-06-09 14:34:18 -05:00 |
|
Richard Peter
|
aaab5e310f
|
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 3beef299b1 [formerly 558699a370] [formerly 3beef299b1 [formerly 558699a370] [formerly e2288769d3 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]
Former-commit-id: e2288769d3
Former-commit-id: 121f0e00a4 [formerly 220f7aa97a]
Former-commit-id: 8ba13f812e
|
2014-05-29 15:50:59 -05:00 |
|
Brian Clements
|
b99b43e383
|
Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de
Former-commit-id: 32cf8deb3a [formerly fb71fae2d1] [formerly 32cf8deb3a [formerly fb71fae2d1] [formerly 5abe7ea99d [formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]]]
Former-commit-id: 5abe7ea99d
Former-commit-id: dc1e069853 [formerly 14a50e4c3d]
Former-commit-id: 1a9aeb2ebd
|
2014-05-29 11:58:10 -05:00 |
|
Brian Clements
|
67376b444a
|
Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: 0a2ddfbc79 [formerly f9de79465a] [formerly 0a2ddfbc79 [formerly f9de79465a] [formerly c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]
Former-commit-id: c875f17719
Former-commit-id: 53de96dd53 [formerly fd9f98b2ba]
Former-commit-id: e7730e2219
|
2014-05-22 14:09:07 -05:00 |
|
Dave Hladky
|
7e763a5a22
|
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: 0ac4de6ad0 [formerly 333bf8b36d] [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8]
Former-commit-id: cb94f9fc97
|
2014-05-05 12:15:14 -05:00 |
|
Dave Hladky
|
a06db5a4e7
|
Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: e2a4bb6755 [formerly c352643c79] [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: ea791b5ca5 [formerly bf42c8d740]
Former-commit-id: 5b11e45636
|
2014-04-30 17:38:28 -05:00 |
|
Brian.Dyke
|
f16c305ae4
|
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: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
|
2014-04-30 12:57:09 -04:00 |
|
Richard Peter
|
938e39a0fc
|
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: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
f31d8cc8cf
|
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: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
|
2014-04-25 11:06:11 -04:00 |
|
Richard Peter
|
cefe83f83f
|
Issue #2928: Update DD WebContainer to allow loading properties from environment
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081
Former-commit-id: cbb5854541 [formerly c74786c35c] [formerly cbb5854541 [formerly c74786c35c] [formerly 2f8da547ea [formerly 119282c58744addb3fd1a5c4a1a165f98d6437a8]]]
Former-commit-id: 2f8da547ea
Former-commit-id: 03ffce2459 [formerly a526ae0370]
Former-commit-id: e70e7fba36
|
2014-04-23 16:01:40 -05:00 |
|
Richard Peter
|
c83ed0cbfa
|
Issue #2928: Add default byte limit, set registry byte limit
Change-Id: I31f6687b30f501a30f78d4b289059d2de19528f6
Former-commit-id: a93aa30709 [formerly 4f0b83a12e] [formerly a93aa30709 [formerly 4f0b83a12e] [formerly 341e8331db [formerly e32d44051831d9b587ab398a19eb5afe7b7b5c58]]]
Former-commit-id: 341e8331db
Former-commit-id: c1f1116be1 [formerly 0938c4314f]
Former-commit-id: 89c8b19d3d
|
2014-04-22 15:08:18 -05:00 |
|
Dave Hladky
|
4ce5dfcd92
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
|
2014-04-21 12:26:47 -05:00 |
|
Benjamin Phillippe
|
160f48406a
|
Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b0d162ccba [formerly b2686e46cf] [formerly b0d162ccba [formerly b2686e46cf] [formerly b86fae838f [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]
Former-commit-id: b86fae838f
Former-commit-id: 1d600c8559 [formerly d8408a9b3f]
Former-commit-id: 201f25eab3
|
2014-04-18 15:10:46 -05:00 |
|
Benjamin Phillippe
|
f026a17b07
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 490413551b [formerly 3db751fc5b] [formerly 490413551b [formerly 3db751fc5b] [formerly 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]
Former-commit-id: 62062bf288
Former-commit-id: 0b149f92d9 [formerly 035272360b]
Former-commit-id: f6f51d3575
|
2014-04-15 09:15:12 -05:00 |
|
Richard Peter
|
de624d87d3
|
Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: e4be1f24e7 [formerly dbba727f3d] [formerly e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: ff87317bd4 [formerly 8b279966d1]
Former-commit-id: b3fd8e5480
|
2014-04-14 13:10:11 -05:00 |
|
Dave Hladky
|
fedb08a7eb
|
Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: 2d18b657a8 [formerly 1671baaf10] [formerly 2d18b657a8 [formerly 1671baaf10] [formerly 9479219b73 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]
Former-commit-id: 9479219b73
Former-commit-id: 86287bb5df [formerly f26450c40d]
Former-commit-id: 577b6402da
|
2014-04-02 14:06:25 -05:00 |
|
Steve Harris
|
d65c768373
|
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd] [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 972fa3bee6 [formerly 7fbbc1e118]
Former-commit-id: 7f932399b9
|
2014-03-06 18:31:10 -06:00 |
|
Benjamin Phillippe
|
719b90e1e7
|
Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: d339e232f4 [formerly ed050996a2] [formerly d339e232f4 [formerly ed050996a2] [formerly 5483d6d7ae [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 603e433054 [formerly 15a5e7c4a4]
Former-commit-id: 090dbe3918
|
2014-03-03 10:57:16 -06:00 |
|
Richard Peter
|
5fab51d41b
|
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: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
|
2014-02-27 15:18:26 -06:00 |
|
Dave Hladky
|
e030ac65b2
|
Issue #2469 Fixed default rules implementation
Former-commit-id: f9c6a396f0 [formerly 1d256bfcee] [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: dc97eb7890 [formerly ff5a5961db]
Former-commit-id: 8a924bcc2c
|
2014-02-24 13:06:52 -06:00 |
|
Benjamin Phillippe
|
d4adefdad8
|
Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216
Former-commit-id: 3f4b92fffb [formerly 1691c5a3ff] [formerly 3f4b92fffb [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]
Former-commit-id: fc589ed84d
Former-commit-id: 20d26dc5a0 [formerly cdaa7e32b4]
Former-commit-id: 01def4be4a
|
2014-02-04 10:24:11 -06:00 |
|