Commit graph

4301 commits

Author SHA1 Message Date
Richard Peter
e7d8e5e560 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 8fb79e7b73 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: c42f931118
Former-commit-id: 2b95bcfb31
2013-11-14 14:56:59 -06:00
Lee Venable
ad77be1b44 Merge "Issue - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: 834c2ac8da [formerly 834c2ac8da [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 7d04b2e4ce
2013-11-14 14:43:18 -06:00
Mike Duff
cf077ed7f9 Issue - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: 87a4b1bec4 [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]
Former-commit-id: a80964bc7c
Former-commit-id: 4557a06f42
2013-11-14 14:40:33 -06:00
Richard Peter
e2a16fd876 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 79bdd34f4f [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 0074b774f0
Former-commit-id: 96b4944b41
2013-11-14 14:40:23 -06:00
Lee Venable
84de0beae4 Merge "Issue - pure python module merge implementation" into development
Former-commit-id: d431f3c0f4 [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]
Former-commit-id: bc7f5e556d
Former-commit-id: 17fef206fc
2013-11-14 14:33:18 -06:00
Richard Peter
ace2a71092 Merge "Issue removed recco from deployment" into development
Former-commit-id: 4d18c7d493 [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 3dc0ad184c
2013-11-14 13:30:09 -06:00
Bryan Kowal
79045d620b Issue - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching

Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1

Former-commit-id: 2029c34f24 [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]
Former-commit-id: 7e35ea310f
Former-commit-id: a2261b9ff3
2013-11-14 11:57:11 -06:00
Steve Harris
39e8f5ecc1 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 473488f5b8 [formerly 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]
Former-commit-id: 4d25eb11c8
Former-commit-id: ef852ac125
2013-11-13 23:20:18 -06:00
Richard Peter
58c8106da8 Merge "Issue Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 2f3eee1439 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]
Former-commit-id: e88f5777a7
Former-commit-id: 64afe42e74
2013-11-13 16:43:26 -06:00
Greg Armendariz
977e0fab0e Merge "Issue - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: 83ac36721b [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]
Former-commit-id: 3f6281fdbe
Former-commit-id: ce0a05242f
2013-11-13 15:30:55 -06:00
Brian Clements
d94f44d406 Issue removed recco from deployment
added update script to drop recco from db


Former-commit-id: 95f1621d3e [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 49c8bd5ee9
2013-11-13 13:45:44 -06:00
Bryan Kowal
1a905e8a3c Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 86dd200844 [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]
Former-commit-id: 0544b66f4e
Former-commit-id: 01735ca0c4
2013-11-13 13:16:55 -06:00
Steve Harris
1fdc64c7e7 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 0a37219d2a [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]
Former-commit-id: 2e7a594d51
Former-commit-id: bc45f3668b
2013-11-13 11:34:17 -06:00
Steve Harris
42ece4fb6a 14.1.1-8 baseline
Former-commit-id: aa6c977e7b [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 0123596fd9
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
64a37e7672 Issue Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: 5cd030f096 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]
Former-commit-id: 1c46226a11
Former-commit-id: fe7c6886c4
2013-11-13 10:52:07 -06:00
Brian Clements
ac221125f4 Issue fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: dfd88151e6 [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]
Former-commit-id: 37f4f41d2d
Former-commit-id: ef2acc6562
2013-11-13 10:04:13 -06:00
Nate Jensen
b7085b0ed4 Merge "Issue added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 85923b0f7f [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]
Former-commit-id: c0ed705daf
Former-commit-id: a62e415724
2013-11-13 09:01:09 -06:00
Brian Clements
b511453153 Issue added fix for TAFs that contain legacy valid times
added unit test


Former-commit-id: 191ffc6e63 [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]
Former-commit-id: df1542a66c
Former-commit-id: 0e5d3e9e69
2013-11-13 08:07:29 -06:00
Bryan Kowal
a575f41589 Issue - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: a51231058a [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]
Former-commit-id: e3639da703
Former-commit-id: 48d5d8c3a1
2013-11-12 19:57:25 -06:00
Bryan Kowal
8867114ff8 Issue - update build scripts to complete the full delta build
Former-commit-id: 7cac007ef1 [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]
Former-commit-id: d76033ff3d
Former-commit-id: 084d772588
2013-11-12 17:43:10 -06:00
Nate Jensen
633faf692b Merge "Issue Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: accfefae6d [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]
Former-commit-id: f0b386b632
Former-commit-id: 80227c4750
2013-11-12 16:55:31 -06:00
Nate Jensen
983afa0eea Merge "Issue better logging of viz spring initialization of bundles" into development
Former-commit-id: 8cf1b752e0 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]
Former-commit-id: b1d376e238
Former-commit-id: 645e816d5d
2013-11-12 16:48:32 -06:00
Dave Hladky
86363574b3 Issue Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 643a150777 [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]
Former-commit-id: e3a259182c
Former-commit-id: 53866e481a
2013-11-12 14:55:41 -06:00
Nate Jensen
a53cf1a079 Merge "Issue removed java 7 specific code from exception subclass" into development
Former-commit-id: 5e02427d6e [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]
Former-commit-id: c60228c854
Former-commit-id: a1315f1072
2013-11-12 14:41:34 -06:00
Greg Armendariz
3852935abf Issue - Remove dead code
Former-commit-id: 4f4d59aa52 [formerly 4f4d59aa52 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]
Former-commit-id: 70c9a36826
Former-commit-id: fbcb810ab3
2013-11-12 14:20:21 -06:00
Richard Peter
0cf51fce74 Merge "Issue BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: 9af1de07d4 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]
Former-commit-id: f12839a9e5
Former-commit-id: c8ff79a7f5
2013-11-12 13:47:04 -06:00
Nate Jensen
5c7be238a0 Issue better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 692ea76d75 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]
Former-commit-id: a4ece1d116
Former-commit-id: 2e86520b53
2013-11-12 13:02:49 -06:00
Nate Jensen
f618186c69 Merge "Issue fix scheduling for start/stop of subscription." into development
Former-commit-id: 88af1ddfcb [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]
Former-commit-id: 64aa00bad6
Former-commit-id: 39679b0608
2013-11-12 12:46:38 -06:00
Brad Gonzales
bad9b3242a Issue 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: 8f70fb1d0c [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]
Former-commit-id: aea0e847aa
Former-commit-id: 866a11a9f0
2013-11-12 12:42:16 -06:00
Brian Clements
94a9ea2ff0 Issue removed java 7 specific code from exception subclass
Former-commit-id: 8b0e85f82c [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]
Former-commit-id: 4050eb5f3e
Former-commit-id: ba12c7467d
2013-11-12 12:41:50 -06:00
Nate Jensen
1f4af0c06a Merge "Issue static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: 3f86a3735e [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]
Former-commit-id: eed4c8604b
Former-commit-id: 18d790a423
2013-11-12 12:13:58 -06:00
Richard Peter
c60b0849b3 Merge "Issue Added subscription notification service to bandwidth manager." into development
Former-commit-id: 8afc87e570 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]
Former-commit-id: 61fc3eba44
Former-commit-id: b8b01f6305
2013-11-12 11:18:56 -06:00
Richard Peter
c8ef435295 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 306bd6fae1 [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 59671c1e7d
2013-11-12 11:11:36 -06:00
Nate Jensen
66ff41e961 Issue static lazy initialization of SubscriptionOverlapService's
JAXBManager

Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac

Former-commit-id: 1ee5d91af2 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: 368d73449e
2013-11-12 11:03:51 -06:00
Dave Hladky
e410d1f44b Issue fix scheduling for start/stop of subscription.
Former-commit-id: b6f1468b7e [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]
Former-commit-id: 976eece1b1
Former-commit-id: 753b36cfea
2013-11-12 10:58:50 -06:00
Nate Jensen
f1b25ed227 Merge "Issue remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: bca5793e3d [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]
Former-commit-id: da8a858727
Former-commit-id: d758e5ab57
2013-11-12 10:55:40 -06:00
Brad Gonzales
1b084e4efa Issue Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: cd221e5263 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]
Former-commit-id: ff5edde334
Former-commit-id: efdc64b7b3
2013-11-12 10:50:06 -06:00
Nate Jensen
f55aa5aea0 Merge "Issue fixed error handling in QPF config" into development
Former-commit-id: 3054868350 [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 68866c322c
2013-11-12 10:39:51 -06:00
Nate Jensen
81749eac08 Merge "Issue added GZIP support to WFS REST" into development
Former-commit-id: f1b8eecca7 [formerly f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]
Former-commit-id: 8c4608630d
Former-commit-id: b87efc6860
2013-11-12 10:39:44 -06:00
Nate Jensen
80c38e1433 Issue remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: b52bdb1cec [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]
Former-commit-id: 7a73c65430
Former-commit-id: 5427e68fd2
2013-11-12 10:37:54 -06:00
Nate Jensen
da95b6f03e Merge "Issue undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 3ed50ff500 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]
Former-commit-id: 23fe7de462
Former-commit-id: 90320ab47a
2013-11-12 09:29:46 -06:00
Bryan Kowal
2565306c95 Issue - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: 8e1c0fb8eb [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]
Former-commit-id: 75e6914df1
Former-commit-id: 5c38f0bfd6
2013-11-11 17:00:17 -06:00
Brian Clements
6b051e1513 Issue fixed error handling in QPF config
Former-commit-id: e2ac7ae212 [formerly e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]
Former-commit-id: 684bd4dc50
Former-commit-id: c6f8609b39
2013-11-11 16:18:16 -06:00
Nate Jensen
5c30fd5b5c Issue undo earlier changes that potentially break uengine based
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: 8628b7755e [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]]
Former-commit-id: a2935193b5
Former-commit-id: 9dc69e316f
2013-11-11 16:14:35 -06:00
Brian Clements
587c9ad61c Issue added GZIP support to WFS REST
small code cleanup in providers


Former-commit-id: 36a0be2db1 [formerly 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]
Former-commit-id: 061515b485
Former-commit-id: 24905af3c4
2013-11-11 16:08:09 -06:00
Steve Harris
92cf79a7cc Merge branch 'omaha_13.5.3' into development
Former-commit-id: 9dabbc7b8e [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]
Former-commit-id: 66f99f3974
Former-commit-id: 9f1d93a2cf
2013-11-11 15:40:45 -06:00
Steve Harris
f4638935b7 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: c1dcded2bd [formerly c1dcded2bd [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]]
Former-commit-id: e0d2de3a19
Former-commit-id: 0d4e6712f8
2013-11-11 15:39:27 -06:00
Steve Harris
0c54c50443 13.5.3-7 baseline
Former-commit-id: 21bed95fa4 [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]]
Former-commit-id: 47102ee47b
Former-commit-id: 3599d7f09b
2013-11-11 16:33:51 -05:00
Nate Jensen
175cc8dd74 Merge "Issue Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development
Former-commit-id: 7dda17a660 [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]
Former-commit-id: 05ee46c4bc
Former-commit-id: 64df0d8d8f
2013-11-11 14:05:11 -06:00
Richard Peter
a40c837424 Merge "Issue Refactored RegistryEvent constructors." into development
Former-commit-id: 13989d9c6e [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]
Former-commit-id: 51649b56e5
Former-commit-id: 8db2d589e3
2013-11-11 13:09:24 -06:00