Steve Harris
165971a4f6
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Dave Hladky
63322de483
Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug
...
Former-commit-id: d734262db63974de8bb846df63942596d06b24c1
2015-03-04 14:11:51 -06:00
Nate Jensen
939ac73a13
Omaha #3978 fix http ebxml thrift service
...
Change-Id: I50e57fcafd472cbfd72fc911e863e118a62ab5ba
Former-commit-id: 6fca25e457989f4757999cfcce40ff9a3b1fc393
2015-03-03 17:20:25 -06:00
Steve Harris
8eb10d0456
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
2015-01-27 11:56:24 -06:00
Dave Hladky
a15e67385a
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
2015-01-22 13:22:18 -06:00
Brian Clements
87e4d0aada
Omaha #3789 moved common.http to ufcore, reworked camel http endpoints
...
Change-Id: Ie1363cb5198c3d90129f5d46465883234f06c58e
Former-commit-id: d81c8f6708e25c93df3dd199293d47f326dea61a
2015-01-08 14:50:36 -06:00
Dave Hladky
36ab95205f
Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
...
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292
Former-commit-id: d8a52577bbe13f53f9afbbae354e8bc58e11a0ed
2015-01-06 14:37:01 -06:00
Nate Jensen
8dbe6abbe4
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Steve Harris
7ddf027412
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 1cbff6bc3dd08f5123e8ad052ad89e548ee63578
2014-10-23 08:47:06 -05:00
Benjamin Phillippe
fdd16051e8
Omaha #3454 Upgrading to Hibernate 4.2.15
...
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
2014-10-20 12:42:19 -05:00
Steve Harris
dafec4c8fe
Merge branch 'omaha_14.4.1' into omaha_pda
...
Conflicts:
cave/com.raytheon.viz.feature.awips.developer/feature.xml
Former-commit-id: f2c656a4fe6d4b82f691e10d8dc49dcbbcff5adc
2014-10-16 13:40:43 -05:00
Benjamin Phillippe
df6b3b3832
Omaha #3718 Restored data delivery subscription backup web page
...
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734
Former-commit-id: f7c7fe2f7b845563335559839a832b26c2ad2b2a
2014-10-10 10:59:16 -05:00
Steve Harris
178618e752
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 452239ce3f7124c35bfc117a5228c1a20967ae9a
2014-08-27 09:57:52 -05:00
Max Schenkelberg
78b87b7a63
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
...
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: 3aff99e787a7368f40cdd161581ead2d3552118c
2014-08-26 11:32:20 -05:00
Richard Peter
651a10715a
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
...
Former-commit-id: e2ed1054e382de6e3656fd9335dedc5af3692c17
2014-08-25 20:43:28 -05:00
Max Schenkelberg
e90bdb6fce
Omaha #3541 Updated A2 baseline to reflect request service split
...
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: e6b16ea30563c0afdd48822e8efc9faabadef8f0
2014-08-22 13:15:42 -05:00
Dave Hladky
8ea42556f4
Omaha #3403 Changed BoundingBoxUtil to accomodate CSW updates for PDA
...
Change-Id: Ia26235017d4f6c860a49e40eae210a94e9385c97
Former-commit-id: b0b596cb03ff44ccbd9a3d0347721bb2fac9c7e6
2014-08-20 14:35:32 -05:00
Benjamin Phillippe
02719e9f90
Omaha #3509 Fixed XACML processing to work properly with DPA
...
Change-Id: I6b66cfe4217c8a9bc2dec1d7e97b7f5203b518fe
Former-commit-id: 4661d8ec3ed187b2ccf270a2acbcd55cc5ef359c
2014-08-20 09:30:16 -05:00
Nate Jensen
1d3047f3d8
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: 9adcbd81d10aa3d464d6dcb0b79b7500f0796cbd
2014-08-15 15:54:08 -05:00
Benjamin Phillippe
ca6c4093b7
Omaha #3509 Minor fixes to custom XACML policy processing
...
Former-commit-id: 21efa23f4c1236e874312c03a60f5c6dc2bd0c9a
2014-08-13 11:09:30 -05:00
Benjamin Phillippe
e9c310b4d8
Omaha #3509 Aded support for custom XACML policies
...
Change-Id: I37c0aac34cbcc30be2a48876cef27cdf97c35a33
Former-commit-id: 1b1cd7789f835fd73dbc0d939df03f6417600154
2014-08-12 10:31:49 -05:00
Nathan Bowler
2cede8a84f
Omaha #3482 Removed org.apache.xml.apis. Update org.apache.ws.security version to 1.6.14
...
Change-Id: Ie3d5e557e4a748ad80202006ccecfb6388612e10
Former-commit-id: 661677010f27b455c19677d22a27f42e3dba184e
2014-08-06 14:41:01 -04:00
Dave Hladky
c6f5e8f6b1
Omaha #3474 AWIPS2-Development portion of DD #2752
...
Former-commit-id: 053a656621ac0b6fb5dfd07b66c3440f61bd7136
2014-07-30 14:57:41 -05:00
Benjamin Phillippe
81997a24cc
Omaha #3255 Fixing dependencies to fix the DPA
...
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9
Former-commit-id: 075bb856689e8eaa95ee7721b6270c3a785c9bd4
2014-07-24 11:27:27 -05:00
Greg Armendariz
8773e17083
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: 111178b736cc4e894f59bc7127ec2bddda96264c
2014-07-21 12:12:32 -05:00
Greg Armendariz
09f6bd471c
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: b59ebac85404fba5657e9041b6f2be7a1959fd9c
2014-07-17 15:41:38 -05:00
Benjamin Phillippe
6cb73e63a1
Omaha #3350 Added user/role authentication. Added XACML authorization
...
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df
Former-commit-id: 81d0249971d4004067b6aef672e00417ddb83b36
2014-07-16 10:49:24 -05:00
Benjamin Phillippe
4e1d93abf8
Omaha #3379 Removing DWR
...
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
2014-07-11 11:56:44 -05:00
Benjamin Phillippe
7960578e2c
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: b81d5e3de415fb08b83d76aafacfef2ca937115c
2014-07-03 12:53:22 -05:00
Dave Hladky
0d1767a3d7
Omaha #2760 Made external JMS route for registry events
...
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6
Former-commit-id: 22e51bc1f882c535c7bafcdfd84428700eb6e547
2014-06-27 10:04:17 -05:00
Dave Hladky
dbf301b8c4
Omaha #3273 Remove all reference off DD env variables from setup.env
...
Former-commit-id: 0ad525e949fc9cf9390909128b4c590034f00963
2014-06-26 09:46:31 -05:00
Dave Hladky
47cc398e91
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 9061033cd5f8299435b5aa83410e2d99f477d07e
2014-06-23 13:03:25 -05:00
Benjamin Phillippe
c2ed8a39d1
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: dbac62df979f23402594dc6439b53e7884ea1bd1
2014-06-18 09:54:40 -05:00
Nate Jensen
3c57231c82
Omaha #3255 attempt to fix build
...
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25
Former-commit-id: 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3
2014-06-17 08:42:29 -05:00
Nate Jensen
c65c392d63
Omaha #3255 fix build
...
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46
Former-commit-id: 579cef6ab063bae1df0cfe85411d174dc75b08bd
2014-06-17 07:40:18 -05:00
Benjamin Phillippe
fb9e936e0e
Omaha #3255 Registry Security Features (commit 1/5)
...
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291
Former-commit-id: ec1b81d28c4b418fada53c684e78d397fee9b97d
2014-06-12 11:26:51 -05:00
Nate Jensen
08c5c75035
Omaha #3211 fix data delivery modes
...
Change-Id: I06fede8fd63e0a71f5532e8124bf919faf62612e
Former-commit-id: 630f2fab4c3c37fd05eb9f92d14c11cf761d9477
2014-06-09 14:34:18 -05:00
Richard Peter
e2288769d3
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
...
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: b48d9bd6affc340ef4791c99cbc95f122c4a69f8
2014-05-29 15:50:59 -05:00
Brian Clements
5abe7ea99d
Omaha #3179 moved ebxml ecludes from datadelivery to registry modes
...
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de
Former-commit-id: f3baedf6187a70e9c98d73b6819fa46e9c00c702
2014-05-29 11:58:10 -05:00
Brian Clements
c875f17719
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: c042671ecf12a6fa46e35d4954d23492f35b7c76
2014-05-22 14:09:07 -05:00
Dave Hladky
ccaaa1cfea
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: 2e5ee5565d1847490e46c59866b14f77555e2a7e
2014-05-05 12:15:14 -05:00
Dave Hladky
3b00ae03cc
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a34955102d1316135c4151210daba0e5807ff6c9
2014-04-30 17:38:28 -05:00
Brian.Dyke
63137ed69c
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: 64c3766ed570885a796f846b889d40413e8250c6
2014-04-30 12:57:09 -04:00
Richard Peter
32957285fc
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: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
2014-04-28 16:27:40 -05:00
Brian.Dyke
3524838f9f
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: f54d2c639a915db14f01f56a7fcc5841b60e1509
2014-04-25 11:06:11 -04:00
Richard Peter
2f8da547ea
Issue #2928 : Update DD WebContainer to allow loading properties from environment
...
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081
Former-commit-id: 119282c58744addb3fd1a5c4a1a165f98d6437a8
2014-04-23 16:01:40 -05:00
Richard Peter
341e8331db
Issue #2928 : Add default byte limit, set registry byte limit
...
Change-Id: I31f6687b30f501a30f78d4b289059d2de19528f6
Former-commit-id: e32d44051831d9b587ab398a19eb5afe7b7b5c58
2014-04-22 15:08:18 -05:00
Dave Hladky
45059e722a
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Benjamin Phillippe
b86fae838f
Issue #3011 Fixed slot cleanup
...
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983
2014-04-18 15:10:46 -05:00
Benjamin Phillippe
62062bf288
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 92c584179ddbad65c115092d3bf82ca6fe114b09
2014-04-15 09:15:12 -05:00
