Richard Peter
0bb5e2a61e
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: dba301df2f593baa951c14b684e7ce4794e32019
2013-11-14 17:21:48 -06:00
Brian Clements
00490c2db2
Issue #2361 fixed ncwf hibernate pickup
...
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: 4924917e28275d9bb8bb21feceb6016ce2c91c40
2013-11-14 17:12:02 -06:00
Mike Duff
47a0477587
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2
2013-11-14 17:07:54 -06:00
Nate Jensen
c2aacfc437
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356
2013-11-14 16:34:28 -06:00
Bryan Kowal
ce16efc9a1
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
...
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: 283853ead3588ef8ea296507b11a9ee9a23e9236
2013-11-14 15:17:28 -06:00
Richard Peter
c42f931118
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 13d284277bed2f0f731547ec443a262556df997c
2013-11-14 14:56:59 -06:00
Richard Peter
0074b774f0
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: f7f30006cdaf3c8e99d166463c226b504f458b83
2013-11-14 14:40:23 -06:00
Lee Venable
bc7f5e556d
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: dbb67d3e8dd56c057626f499b2e3aa6b06eac41f
2013-11-14 14:33:18 -06:00
Richard Peter
3f5c590c5f
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 3e92bb969aef3508f08eb55a2ef1903030abc525
2013-11-14 13:30:09 -06:00
Nate Jensen
c5cf68cc45
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d
2013-11-14 13:29:30 -06:00
Bryan Kowal
7e35ea310f
Issue #2540 - 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: c0595b49cab0d0ef636427ed3b31ea805f8adb43
2013-11-14 11:57:11 -06:00
Steve Harris
4d25eb11c8
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 2117af3beb252132a10f44aab162a1ca17ef3abd
2013-11-13 23:20:18 -06:00
Richard Peter
e88f5777a7
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f
2013-11-13 16:43:26 -06:00
Brian Clements
8cbe2c06a8
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: f4e66b8afce682014a0fa1ef9585b7ee6480e1e1
2013-11-13 13:45:44 -06:00
Bryan Kowal
0544b66f4e
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638
2013-11-13 13:16:55 -06:00
Steve Harris
c7d36eb6ad
14.1.1-8 baseline
...
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
1c46226a11
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: ce2db6d930faf1166bec9956fb21ea51e2329d40
2013-11-13 10:52:07 -06:00
Brian Clements
37f4f41d2d
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: d8e8b2323da3444cbff8b625f6b5098850888ee2
2013-11-13 10:04:13 -06:00
Brian Clements
df1542a66c
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: 6d33448f0f6962a3da2a5c51f27253173f40cb93
2013-11-13 08:07:29 -06:00
Nate Jensen
f0b386b632
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: 833e94630c023f49704c8f4a36054b79e85ce4fe
2013-11-12 16:55:31 -06:00
Dave Hladky
e3a259182c
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 8de606bc467ba4d567bc2825f2aa10211774ff7d
2013-11-12 14:55:41 -06:00
Nate Jensen
c60228c854
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: 685d0f17845c90d4bd5a6d81da66f47285b08c8e
2013-11-12 14:41:34 -06:00
Richard Peter
f12839a9e5
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: 116b4409d4657b5dba8c9e3e52e2198661cb9691
2013-11-12 13:47:04 -06:00
Nate Jensen
64aa00bad6
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb
2013-11-12 12:46:38 -06:00
Brad Gonzales
aea0e847aa
Issue #2506 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: 7684f7bd51770a41e68700f1d4408a6aad5cd877
2013-11-12 12:42:16 -06:00
Brian Clements
4050eb5f3e
Issue #2539 removed java 7 specific code from exception subclass
...
Former-commit-id: 5ea90c5f6e6a95a2f063908e0f117973f5cce584
2013-11-12 12:41:50 -06:00
Nate Jensen
eed4c8604b
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
...
Former-commit-id: 2279e785ab3e47008afee489c1a4e96972f26b79
2013-11-12 12:13:58 -06:00
Richard Peter
61fc3eba44
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
...
Former-commit-id: adb5c06b63444331d7d470ddb6e7aff038cc40c1
2013-11-12 11:18:56 -06:00
Richard Peter
460a7b8b5d
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: 333073fc97c9d454d0e41f8fbe01be3a19b18184
2013-11-12 11:11:36 -06:00
Nate Jensen
2cdc7e5e63
Issue #2361 static lazy initialization of SubscriptionOverlapService's
...
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: f42d92e543ab2ecf516e159a0756de7cb3417b88
2013-11-12 11:03:51 -06:00
Dave Hladky
976eece1b1
Issue #2448 fix scheduling for start/stop of subscription.
...
Former-commit-id: de110d3747096601a122f64cc5d6037823213e92
2013-11-12 10:58:50 -06:00
Nate Jensen
da8a858727
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
...
Former-commit-id: 621fb8fce876fdd3bde1b37d43d5f00945cd50f5
2013-11-12 10:55:40 -06:00
Brad Gonzales
ff5edde334
Issue #2506 Added subscription notification service to bandwidth manager.
...
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd
2013-11-12 10:50:06 -06:00
Nate Jensen
d8f2ffbceb
Merge "Issue #2377 fixed error handling in QPF config" into development
...
Former-commit-id: 3a9f89bff3e1b54059cda1cd2320be8dc1833c04
2013-11-12 10:39:51 -06:00
Nate Jensen
8c4608630d
Merge "Issue #2539 added GZIP support to WFS REST" into development
...
Former-commit-id: e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3
2013-11-12 10:39:44 -06:00
Nate Jensen
7a73c65430
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: df601fc0d4c9085c03eec4e12f17878c757ddddf
2013-11-12 10:37:54 -06:00
Nate Jensen
23fe7de462
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
...
Former-commit-id: 7a8934c9005f25a16874be26e06625d56df5c024
2013-11-12 09:29:46 -06:00
Bryan Kowal
75e6914df1
Issue #2540 - 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: 315ca002de4045f0d7ae6b298012365a052a7430
2013-11-11 17:00:17 -06:00
Brian Clements
684bd4dc50
Issue #2377 fixed error handling in QPF config
...
Former-commit-id: 8e8c57301c6167fa161fd55be0e3fae3f974918b
2013-11-11 16:18:16 -06:00
Nate Jensen
a2935193b5
Issue #2361 undo earlier changes that potentially break uengine based
...
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: 110cff66bb2cf847730562570a9415851e0362c2
2013-11-11 16:14:35 -06:00
Brian Clements
061515b485
Issue #2539 added GZIP support to WFS REST
...
small code cleanup in providers
Former-commit-id: 943310ed8b34f62d73dee1dff32d5c3b9f424e3c
2013-11-11 16:08:09 -06:00
Nate Jensen
05ee46c4bc
Merge "Issue #2492 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: 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec
2013-11-11 14:05:11 -06:00
Richard Peter
51649b56e5
Merge "Issue #2506 Refactored RegistryEvent constructors." into development
...
Former-commit-id: dd8f83135b04ff4510b1f860846f1a6a3db09f47
2013-11-11 13:09:24 -06:00
Bryan Kowal
411e0fa7c4
Issue #2297 - fix 14.2.1 merge
...
Former-commit-id: e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b
2013-11-11 13:04:21 -06:00
Steve Harris
8a2e9f1725
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
...
Former-commit-id: a4c8e9a5fb9d50844da854e453b6146c2a6e75c3
2013-11-11 11:45:35 -06:00
Max Schenkelberg
bd903f6641
Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
...
Change-Id: Ic82f45447113425a08909be4c5229502882db022
Former-commit-id: 58ccc575973ea9a1778659e17daff8577747dec5
2013-11-11 11:09:00 -06:00
Nate Jensen
06acf1b8a0
Merge "Issue #1314 removed common.spatial plugin" into development
...
Former-commit-id: 823cb0e07793ec5baa1863088634a312364b3d8b
2013-11-11 08:48:44 -06:00
Steve Harris
3a5028a42d
Issue #2214 - merge fix: Removed duplicate annotation @Override
...
Former-commit-id: d398883ce95b61d0a1befb3943a636c4c213784d
2013-11-11 08:15:30 -06:00
Brad Gonzales
d80183edc1
Issue #2506 Refactored RegistryEvent constructors.
...
Amend: Added call to default constructor in Event initialization constructor.
Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454
Former-commit-id: f4cb28f209073788a3c329c44283c8c8cf3bf70f
2013-11-08 15:46:40 -06:00
Brad Gonzales
e2fb158757
Issue #2506 fixed issues with shared distributed ingest.
...
Amend: Updated comment in StoreRetrievedData.
Removed separate messageing to clear BandwidthSubscriptions.
Add fix and test case for SBN deserialization with content following the ending xml tag.
Removed unneeded changes.
Added XmlWMOMessage class.
Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd
Former-commit-id: 0b667fbd94788a8a5b598ae5f5586d4b710518a4
2013-11-08 15:29:05 -06:00
