Commit graph

170 commits

Author SHA1 Message Date
Dave Hladky
931bbaeba1 Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug
Former-commit-id: 63322de483 [formerly 44b9d9691d [formerly e958125848] [formerly 63322de483 [formerly d734262db63974de8bb846df63942596d06b24c1]]]
Former-commit-id: 44b9d9691d [formerly e958125848]
Former-commit-id: 44b9d9691d
Former-commit-id: ada3a1c3f1
2015-03-04 14:11:51 -06:00
Dave Hladky
fc9a125f42 Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: a15e67385a [formerly 5fd928ec4c [formerly c1127b066f] [formerly a15e67385a [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]]
Former-commit-id: 5fd928ec4c [formerly c1127b066f]
Former-commit-id: 5fd928ec4c
Former-commit-id: 41b0ae02d4
2015-01-22 13:22:18 -06:00
Dave Hladky
8ee78747a6 Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: 36ab95205f [formerly c6aca09cf3 [formerly 66aa4b2fbf] [formerly 36ab95205f [formerly d8a52577bbe13f53f9afbbae354e8bc58e11a0ed]]]
Former-commit-id: c6aca09cf3 [formerly 66aa4b2fbf]
Former-commit-id: c6aca09cf3
Former-commit-id: a223529e47
2015-01-06 14:37:01 -06:00
Nate Jensen
e291bd932f Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0]
Former-commit-id: 6c1391e938
Former-commit-id: effb6c68bf
2014-12-03 15:47:10 -06:00
Steve Harris
b2f2ae8997 Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 7ddf027412 [formerly f4fc695a4d [formerly b5377ec6f1] [formerly 7ddf027412 [formerly 1cbff6bc3dd08f5123e8ad052ad89e548ee63578]]]
Former-commit-id: f4fc695a4d [formerly b5377ec6f1]
Former-commit-id: f4fc695a4d
Former-commit-id: da5c17e11b
2014-10-23 08:47:06 -05:00
Benjamin Phillippe
81a16aa4de Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: fdd16051e8 [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f]
Former-commit-id: e6deeb6fb5
Former-commit-id: af4f8e1c8a
2014-10-20 12:42:19 -05:00
Steve Harris
1077e3c273 Merge branch 'omaha_14.4.1' into omaha_pda
Conflicts:
	cave/com.raytheon.viz.feature.awips.developer/feature.xml

Former-commit-id: dafec4c8fe [formerly 716c1c8dae [formerly 4535f432ce] [formerly dafec4c8fe [formerly f2c656a4fe6d4b82f691e10d8dc49dcbbcff5adc]]]
Former-commit-id: 716c1c8dae [formerly 4535f432ce]
Former-commit-id: 716c1c8dae
Former-commit-id: 378db03f97
2014-10-16 13:40:43 -05:00
Benjamin Phillippe
b95401f067 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: df6b3b3832 [formerly a7d5db57d8 [formerly 825aa0d5b2] [formerly df6b3b3832 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]]
Former-commit-id: a7d5db57d8 [formerly 825aa0d5b2]
Former-commit-id: a7d5db57d8
Former-commit-id: 7e7b270f68
2014-10-10 10:59:16 -05:00
Steve Harris
03a4d8193f Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 178618e752 [formerly 20c01c75f9 [formerly c82bf0de9b] [formerly 178618e752 [formerly 452239ce3f7124c35bfc117a5228c1a20967ae9a]]]
Former-commit-id: 20c01c75f9 [formerly c82bf0de9b]
Former-commit-id: 20c01c75f9
Former-commit-id: 7c83069fba
2014-08-27 09:57:52 -05:00
Max Schenkelberg
ebad28ddfd Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea

Former-commit-id: 78b87b7a63 [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: dacc10bcbc [formerly 63967fbc78]
Former-commit-id: dacc10bcbc
Former-commit-id: d9536b7161
2014-08-26 11:32:20 -05:00
Richard Peter
60fa525bd3 Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 651a10715a [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]
Former-commit-id: 64848acf9d [formerly 5cce505b7f]
Former-commit-id: 64848acf9d
Former-commit-id: c1f0cfdcc0
2014-08-25 20:43:28 -05:00
Max Schenkelberg
5c157bf266 Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: e90bdb6fce [formerly 88ea402947 [formerly 896e353950] [formerly e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]
Former-commit-id: 88ea402947 [formerly 896e353950]
Former-commit-id: 88ea402947
Former-commit-id: 0419aeea52
2014-08-22 13:15:42 -05:00
Dave Hladky
f0d5edd49a Omaha #3403 Changed BoundingBoxUtil to accomodate CSW updates for PDA
Change-Id: Ia26235017d4f6c860a49e40eae210a94e9385c97

Former-commit-id: 8ea42556f4 [formerly ba60e36674 [formerly 76d6ce277e] [formerly 8ea42556f4 [formerly b0b596cb03ff44ccbd9a3d0347721bb2fac9c7e6]]]
Former-commit-id: ba60e36674 [formerly 76d6ce277e]
Former-commit-id: ba60e36674
Former-commit-id: f0ac16b4f9
2014-08-20 14:35:32 -05:00
Benjamin Phillippe
850f5411d0 Omaha #3509 Fixed XACML processing to work properly with DPA
Change-Id: I6b66cfe4217c8a9bc2dec1d7e97b7f5203b518fe

Former-commit-id: 02719e9f90 [formerly defe9d1c42 [formerly 201962c6fc] [formerly 02719e9f90 [formerly 4661d8ec3ed187b2ccf270a2acbcd55cc5ef359c]]]
Former-commit-id: defe9d1c42 [formerly 201962c6fc]
Former-commit-id: defe9d1c42
Former-commit-id: e230d38e13
2014-08-20 09:30:16 -05:00
Nate Jensen
ca950a3e13 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: 1d3047f3d8 [formerly c612ca234c [formerly 83b666c0df] [formerly 1d3047f3d8 [formerly 9adcbd81d10aa3d464d6dcb0b79b7500f0796cbd]]]
Former-commit-id: c612ca234c [formerly 83b666c0df]
Former-commit-id: c612ca234c
Former-commit-id: 6b51b46952
2014-08-15 15:54:08 -05:00
Benjamin Phillippe
bcee8bb531 Omaha #3509 Minor fixes to custom XACML policy processing
Former-commit-id: ca6c4093b7 [formerly f4cb4304e3 [formerly 085c6407d5] [formerly ca6c4093b7 [formerly 21efa23f4c1236e874312c03a60f5c6dc2bd0c9a]]]
Former-commit-id: f4cb4304e3 [formerly 085c6407d5]
Former-commit-id: f4cb4304e3
Former-commit-id: 6693e1241b
2014-08-13 11:09:30 -05:00
Benjamin Phillippe
58396b7ad9 Omaha #3509 Aded support for custom XACML policies
Change-Id: I37c0aac34cbcc30be2a48876cef27cdf97c35a33

Former-commit-id: e9c310b4d8 [formerly b68b812dbc [formerly 1410dc479e] [formerly e9c310b4d8 [formerly 1b1cd7789f835fd73dbc0d939df03f6417600154]]]
Former-commit-id: b68b812dbc [formerly 1410dc479e]
Former-commit-id: b68b812dbc
Former-commit-id: 5b6104a8ad
2014-08-12 10:31:49 -05:00
Nathan Bowler
73d9335d87 Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14
Change-Id: Ie3d5e557e4a748ad80202006ccecfb6388612e10

Former-commit-id: 2cede8a84f [formerly a2dc4559dd [formerly 3f2c4818d9] [formerly 2cede8a84f [formerly 661677010f27b455c19677d22a27f42e3dba184e]]]
Former-commit-id: a2dc4559dd [formerly 3f2c4818d9]
Former-commit-id: a2dc4559dd
Former-commit-id: 7727ac1fd2
2014-08-06 14:41:01 -04:00
Dave Hladky
87f758426c Omaha #3474 AWIPS2-Development portion of DD #2752
Former-commit-id: c6f5e8f6b1 [formerly a9f1b748f4 [formerly 944637a144] [formerly c6f5e8f6b1 [formerly 053a656621ac0b6fb5dfd07b66c3440f61bd7136]]]
Former-commit-id: a9f1b748f4 [formerly 944637a144]
Former-commit-id: a9f1b748f4
Former-commit-id: e7e8efa1d9
2014-07-30 14:57:41 -05:00
Benjamin Phillippe
e682727e2b Omaha #3255 Fixing dependencies to fix the DPA
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9

Former-commit-id: 81997a24cc [formerly 29c5dbe30a [formerly a19c9c1243] [formerly 81997a24cc [formerly 075bb856689e8eaa95ee7721b6270c3a785c9bd4]]]
Former-commit-id: 29c5dbe30a [formerly a19c9c1243]
Former-commit-id: 29c5dbe30a
Former-commit-id: 8aa8f261cd
2014-07-24 11:27:27 -05:00
Greg Armendariz
e2c88e1b39 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: 8773e17083 [formerly e5919e105b [formerly f12b1a1098] [formerly 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]]
Former-commit-id: e5919e105b [formerly f12b1a1098]
Former-commit-id: e5919e105b
Former-commit-id: 0afcd724ec
2014-07-21 12:12:32 -05:00
Greg Armendariz
e541e4c600 Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: 09f6bd471c [formerly e3f927e52c [formerly b34486973e] [formerly 09f6bd471c [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]
Former-commit-id: e3f927e52c [formerly b34486973e]
Former-commit-id: e3f927e52c
Former-commit-id: 22ede9935d
2014-07-17 15:41:38 -05:00
Benjamin Phillippe
91df842c4c Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df

Former-commit-id: 6cb73e63a1 [formerly d4997f5a90 [formerly cebfbebea6] [formerly 6cb73e63a1 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]]
Former-commit-id: d4997f5a90 [formerly cebfbebea6]
Former-commit-id: d4997f5a90
Former-commit-id: c74f855d31
2014-07-16 10:49:24 -05:00
Benjamin Phillippe
5c606a44b6 Omaha #3379 Removing DWR
Former-commit-id: 4e1d93abf8 [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: cc9e9b427a [formerly d110e8428b]
Former-commit-id: cc9e9b427a
Former-commit-id: e613cb932e
2014-07-11 11:56:44 -05:00
Benjamin Phillippe
d0cfe0b25e Omaha #3350 Removing OBE classes/files for registry user registry and identity management
Former-commit-id: 7960578e2c [formerly c6c2f9240e [formerly ba0472caad] [formerly 7960578e2c [formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]
Former-commit-id: c6c2f9240e [formerly ba0472caad]
Former-commit-id: c6c2f9240e
Former-commit-id: 804a11f0f5
2014-07-03 12:53:22 -05:00
Dave Hladky
896d407320 Omaha #2760 Made external JMS route for registry events
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6

Former-commit-id: 0d1767a3d7 [formerly 445ddc86a5 [formerly 5556e447e6] [formerly 0d1767a3d7 [formerly 22e51bc1f882c535c7bafcdfd84428700eb6e547]]]
Former-commit-id: 445ddc86a5 [formerly 5556e447e6]
Former-commit-id: 445ddc86a5
Former-commit-id: 4c1abdefcd
2014-06-27 10:04:17 -05:00
Dave Hladky
d529e22655 Omaha #3273 Remove all reference off DD env variables from setup.env
Former-commit-id: dbf301b8c4 [formerly b9c930dd14 [formerly f2b4bcfef1] [formerly dbf301b8c4 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]]]
Former-commit-id: b9c930dd14 [formerly f2b4bcfef1]
Former-commit-id: b9c930dd14
Former-commit-id: b2c4c45dfa
2014-06-26 09:46:31 -05:00
Dave Hladky
a79ba72481 Omaha #3306 Made DPA SSL comms work
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d

Former-commit-id: 47cc398e91 [formerly 67d1468c8c [formerly c6a1a5592c] [formerly 47cc398e91 [formerly 9061033cd5f8299435b5aa83410e2d99f477d07e]]]
Former-commit-id: 67d1468c8c [formerly c6a1a5592c]
Former-commit-id: 67d1468c8c
Former-commit-id: 3d58cd6267
2014-06-23 13:03:25 -05:00
Benjamin Phillippe
f717389470 Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e

Former-commit-id: c2ed8a39d1 [formerly b41f79658f [formerly 270caaadde] [formerly c2ed8a39d1 [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: b41f79658f [formerly 270caaadde]
Former-commit-id: b41f79658f
Former-commit-id: 50e9bbd139
2014-06-18 09:54:40 -05:00
Nate Jensen
42b7a0fd7d Omaha #3255 attempt to fix build
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: 3c57231c82 [formerly 985c88d38b [formerly bc48674092] [formerly 3c57231c82 [formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]]]
Former-commit-id: 985c88d38b [formerly bc48674092]
Former-commit-id: 985c88d38b
Former-commit-id: af077fdf89
2014-06-17 08:42:29 -05:00
Nate Jensen
903385bb8f Omaha #3255 fix build
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: c65c392d63 [formerly 4fd29b211a [formerly a8bae916f3] [formerly c65c392d63 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]]]
Former-commit-id: 4fd29b211a [formerly a8bae916f3]
Former-commit-id: 4fd29b211a
Former-commit-id: 382fd79fb5
2014-06-17 07:40:18 -05:00
Benjamin Phillippe
6422416042 Omaha #3255 Registry Security Features (commit 1/5)
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291

Former-commit-id: fb9e936e0e [formerly e05f09bb20 [formerly cfe7bb251f] [formerly fb9e936e0e [formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]]]
Former-commit-id: e05f09bb20 [formerly cfe7bb251f]
Former-commit-id: e05f09bb20
Former-commit-id: d293b9addc
2014-06-12 11:26:51 -05:00
Nate Jensen
ae7d25a335 Omaha #3211 fix data delivery modes
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e

Former-commit-id: 08c5c75035 [formerly 9666b22375 [formerly cd7e1a4665] [formerly 08c5c75035 [formerly 630f2fab4c3c37fd05eb9f92d14c11cf761d9477]]]
Former-commit-id: 9666b22375 [formerly cd7e1a4665]
Former-commit-id: 9666b22375
Former-commit-id: 172b60415c
2014-06-09 14:34:18 -05:00
Richard Peter
86ca295992 Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: e2288769d3 [formerly 3beef299b1 [formerly 558699a370] [formerly e2288769d3 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]
Former-commit-id: 3beef299b1 [formerly 558699a370]
Former-commit-id: 3beef299b1
Former-commit-id: 8cbf5f4762
2014-05-29 15:50:59 -05:00
Brian Clements
9ca524a1f3 Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de

Former-commit-id: 5abe7ea99d [formerly 32cf8deb3a [formerly fb71fae2d1] [formerly 5abe7ea99d [formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]]]
Former-commit-id: 32cf8deb3a [formerly fb71fae2d1]
Former-commit-id: 32cf8deb3a
Former-commit-id: d1a4845e01
2014-05-29 11:58:10 -05:00
Brian Clements
fe8eb82e92 Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: c875f17719 [formerly 0a2ddfbc79 [formerly f9de79465a] [formerly c875f17719 [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]
Former-commit-id: 0a2ddfbc79 [formerly f9de79465a]
Former-commit-id: 0a2ddfbc79
Former-commit-id: 8471e4d8a4
2014-05-22 14:09:07 -05:00
Dave Hladky
363f9c41f5 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: ccaaa1cfea [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: 0ac4de6ad0 [formerly 333bf8b36d]
Former-commit-id: 0ac4de6ad0
Former-commit-id: 7d244313a5
2014-05-05 12:15:14 -05:00
Dave Hladky
fcb80a2b11 Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: 3b00ae03cc [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: e2a4bb6755 [formerly c352643c79]
Former-commit-id: e2a4bb6755
Former-commit-id: a14cb8c45f
2014-04-30 17:38:28 -05:00
Brian.Dyke
52e1ad897c 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: 63137ed69c [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: e56bd61ee6 [formerly 278aab6b6f]
Former-commit-id: e56bd61ee6
Former-commit-id: 2e687fbfb7
2014-04-30 12:57:09 -04:00
Richard Peter
3d9938c5a3 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: 32957285fc [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 67683dd891 [formerly 44b1782461]
Former-commit-id: 67683dd891
Former-commit-id: 8b1a177110
2014-04-28 16:27:40 -05:00
Brian.Dyke
83727709c6 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: 3524838f9f [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: f0b8ea5822 [formerly fb1f5aa593]
Former-commit-id: f0b8ea5822
Former-commit-id: 362d882b40
2014-04-25 11:06:11 -04:00
Richard Peter
7b1f763f8e Issue #2928: Update DD WebContainer to allow loading properties from environment
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081

Former-commit-id: 2f8da547ea [formerly cbb5854541 [formerly c74786c35c] [formerly 2f8da547ea [formerly 119282c58744addb3fd1a5c4a1a165f98d6437a8]]]
Former-commit-id: cbb5854541 [formerly c74786c35c]
Former-commit-id: cbb5854541
Former-commit-id: c02884249a
2014-04-23 16:01:40 -05:00
Richard Peter
bd6084f0a5 Issue #2928: Add default byte limit, set registry byte limit
Change-Id: I31f6687b30f501a30f78d4b289059d2de19528f6

Former-commit-id: 341e8331db [formerly a93aa30709 [formerly 4f0b83a12e] [formerly 341e8331db [formerly e32d44051831d9b587ab398a19eb5afe7b7b5c58]]]
Former-commit-id: a93aa30709 [formerly 4f0b83a12e]
Former-commit-id: a93aa30709
Former-commit-id: 1f8cbbc545
2014-04-22 15:08:18 -05:00
Dave Hladky
bd28ab03c8 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 45059e722a [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 91bd735d47 [formerly 61fc2fea51]
Former-commit-id: 91bd735d47
Former-commit-id: 7295635379
2014-04-21 12:26:47 -05:00
Benjamin Phillippe
c63f776fd4 Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5

Former-commit-id: b86fae838f [formerly b0d162ccba [formerly b2686e46cf] [formerly b86fae838f [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]]]
Former-commit-id: b0d162ccba [formerly b2686e46cf]
Former-commit-id: b0d162ccba
Former-commit-id: f4169e4e0c
2014-04-18 15:10:46 -05:00
Benjamin Phillippe
b03d84d7d4 Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 62062bf288 [formerly 490413551b [formerly 3db751fc5b] [formerly 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]
Former-commit-id: 490413551b [formerly 3db751fc5b]
Former-commit-id: 490413551b
Former-commit-id: 575caa6238
2014-04-15 09:15:12 -05:00
Richard Peter
71e346aa6e Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 17196b5dcd [formerly e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: e4be1f24e7 [formerly dbba727f3d]
Former-commit-id: e4be1f24e7
Former-commit-id: 909571ebca
2014-04-14 13:10:11 -05:00
Dave Hladky
62ba92ce09 Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc

Former-commit-id: 9479219b73 [formerly 2d18b657a8 [formerly 1671baaf10] [formerly 9479219b73 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]
Former-commit-id: 2d18b657a8 [formerly 1671baaf10]
Former-commit-id: 2d18b657a8
Former-commit-id: ec2c3b4af2
2014-04-02 14:06:25 -05:00
Steve Harris
653fb44d87 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 1c64a5c025 [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd]
Former-commit-id: dc7d6ceced
Former-commit-id: 08dbf1f7ea
2014-03-06 18:31:10 -06:00
Benjamin Phillippe
90aa73fbb3 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: 5483d6d7ae [formerly d339e232f4 [formerly ed050996a2] [formerly 5483d6d7ae [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: d339e232f4 [formerly ed050996a2]
Former-commit-id: d339e232f4
Former-commit-id: ea31c5b370
2014-03-03 10:57:16 -06:00