Commit graph

119 commits

Author SHA1 Message Date
Benjamin Phillippe
ea31c5b370 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]
Former-commit-id: ed050996a2
Former-commit-id: d339e232f4
2014-03-03 10:57:16 -06:00
Ron Anderson
410f956cff Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 32bcf9d0d0
Former-commit-id: e7f2b6883d
2014-02-18 10:45:20 -06:00
Brian.Dyke
4c6eb0c001 14.1.1-17 baseline
Former-commit-id: 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 180d1356cd
Former-commit-id: f3d34b0c38
2014-02-04 12:33:46 -05:00
Richard Peter
007de15a53 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]
Former-commit-id: 6b859c9a42
Former-commit-id: e6bc012925
2014-01-20 17:21:21 -06:00
Steve Harris
002b2492ac Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]
Former-commit-id: 454d557884
Former-commit-id: 5fcccbff1b
2014-01-20 10:17:44 -06:00
Mike Duff
e6efbf5663 Issue #2459 - Remove unscheduled status from UI
Former-commit-id: 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]
Former-commit-id: 93cb80cfc7
Former-commit-id: 0cfa9ee36c
2014-01-17 15:34:48 -06:00
Richard Peter
d7e7ca2e26 Issue #2125: Clean up hibernate warnings
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e

Former-commit-id: 0c058f461c [formerly e2d20753e1 [formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]]
Former-commit-id: e2d20753e1
Former-commit-id: f30181d730
2014-01-17 14:12:34 -06:00
Ron Anderson
2e8cbade9f Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: ba7a25a88f
Former-commit-id: 0bde38cef3
2014-01-13 17:45:20 -06:00
Nate Jensen
13ec91c615 Issue #2359 minor request JVM startup safety
Change-Id: I17a5f3217ac5a2f2d53660bdb45a6009c8f27004

Former-commit-id: f83a473653 [formerly 24560cf307 [formerly 3916523cd702e367a6d66743b0517872475a0c36]]
Former-commit-id: 24560cf307
Former-commit-id: 459771f66d
2014-01-07 13:25:45 -06:00
Steve Harris
94a748fa8d 14.1.1-14 baseline
Former-commit-id: 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: f2ad9da4eb
Former-commit-id: 6df7c67f95
2014-01-06 14:02:30 -05:00
Benjamin Phillippe
fd4e9edb76 Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: 0cb4e61261 [formerly 969099d4c4 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]
Former-commit-id: 969099d4c4
Former-commit-id: b2c565c173
2013-12-11 12:20:12 -06:00
Brian Clements
42f7214967 Issue #2393 removed pypies interpolation
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: 0f40ae2b99 [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]
Former-commit-id: fe58826a1e
Former-commit-id: d35fc591d2
2013-11-20 08:40:12 -06:00
Richard Peter
061fa07147 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: 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 306bd6fae1
Former-commit-id: 7ba466f5a6
2013-11-12 11:11:36 -06:00
Nate Jensen
f5b461908d Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 08441efbb7 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]
Former-commit-id: 7a27264094
Former-commit-id: 040f022e5d
2013-11-08 12:37:26 -06:00
Steve Harris
21ff310620 14.1.1-7 baseline
Former-commit-id: 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
2013-11-06 14:16:14 -05:00
Bryan Kowal
5164a7c0b1 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
2013-10-31 15:34:46 -05:00
Steve Harris
cb3b53f205 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
2013-10-28 10:55:16 -04:00
Benjamin Phillippe
9bc1058db1 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: ed23a786d6 [formerly a4e5cd5fd7 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]
Former-commit-id: a4e5cd5fd7
Former-commit-id: 12d23800c7
2013-10-18 09:20:40 -05:00
Richard Peter
cbf18e7a32 Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]
Former-commit-id: cd504e4e98
Former-commit-id: cbf53120dd
2013-10-15 11:36:12 -05:00
Nate Jensen
2fb28dce46 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]
Former-commit-id: b49a2ceb2f
Former-commit-id: d7e4576380
2013-10-14 15:30:09 -05:00
Steve Harris
d455ad79ce Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]
Former-commit-id: 852c02c848
Former-commit-id: 1581adfa64
2013-10-14 09:28:24 -05:00
Steve Harris
2f59153a18 13.5.2-10 baseline
Former-commit-id: c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]
Former-commit-id: 46c351de6c
Former-commit-id: 1efbba7a4b
2013-10-14 09:59:31 -04:00
Richard Peter
1af5b95d92 Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]
Former-commit-id: 9adbe25ceb
Former-commit-id: f141fdd5ab
2013-10-08 10:59:50 -05:00
Bryan Kowal
5ffff05346 Issue #2272 - EDEX updates for ALR
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically

Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369

Former-commit-id: 73690a97aa [formerly 26cf5dad60 [formerly d1f201a579b9a0421295df26c9ad17717581073f]]
Former-commit-id: 26cf5dad60
Former-commit-id: 60c544c7a9
2013-10-02 15:49:16 -05:00
Dave Hladky
6a74f91b94 Issue #2399 Updated logging of duplicates
Change-Id: Id81a219e58734ec6894f198b97b5532cc3b868de

Former-commit-id: a95c022799 [formerly 6de76d215d [formerly 91e608f8b14d4634e4d223fe732b37a0fdc243e0]]
Former-commit-id: 6de76d215d
Former-commit-id: e6d2e37caf
2013-09-23 13:39:34 -05:00
Richard Peter
df374f45aa Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs
Former-commit-id: da4faa645d [formerly 4b6e4fcd3a [formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]
Former-commit-id: 4b6e4fcd3a
Former-commit-id: a0d6ce6dbb
2013-09-12 13:47:43 -05:00
Richard Peter
04c64843dd Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 80e7b265dd [formerly 41550aaf9f [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]
Former-commit-id: 41550aaf9f
Former-commit-id: feeddb503f
2013-09-12 12:48:36 -05:00
Richard Peter
713d540d81 Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 7175e78cf7 [formerly 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]
Former-commit-id: 592218edb8
Former-commit-id: ff660a78c7
2013-09-03 11:51:27 -05:00
Benjamin Phillippe
1d1526591b Issue #2191 Registry federation synchronization and garbage collection
Change-Id: Ie17468d90c5c1a2f1b708d6e69edd2d026e17633

Former-commit-id: 3396e5a620 [formerly 62d822c06b [formerly b8930f3c76f6285627aa54307f08fd28c627a4b2]]
Former-commit-id: 62d822c06b
Former-commit-id: 71da6363b2
2013-07-30 09:37:41 -05:00
Max Schenkelberg
cd88054e2b Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
2013-07-15 14:26:15 -05:00
Benjamin Phillippe
4a482184ca Issue #2191: Registry Garbage Collection
Change-Id: I15094a928b4f8793daab751b85a20b19b6352438

Former-commit-id: 34764a4a09 [formerly 3aebfb2956 [formerly 6afda27e19d0ea38c547afc9a28c55525706f9f1]]
Former-commit-id: 3aebfb2956
Former-commit-id: 0af12c7e8b
2013-07-12 11:33:21 -05:00
Dustin Johnson
ed0ff8ff85 Merge "Issue #2106 Improve BandwidthManager performance - Use copy constructors - Separate BandwidthBucket handling into a DAO - Preparations to remove all in-memory object handling" into development
Former-commit-id: 59c1cd7a5e [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]
Former-commit-id: f5d66a9f0d
Former-commit-id: f519f21b79
2013-07-08 15:53:15 -05:00
Dustin Johnson
01193120be Issue #2106 Improve BandwidthManager performance
- Use copy constructors
- Separate BandwidthBucket handling into a DAO
- Preparations to remove all in-memory object handling

Amend: Copy more calendar and byte array objects

Change-Id: I72f4813c0780586585409a9a64c7915adc1ccbae

Former-commit-id: a6575c3235 [formerly 124edcbd15 [formerly e11242447c3c93f403cd546df4315381486e465c]]
Former-commit-id: 124edcbd15
Former-commit-id: 4526635405
2013-07-08 10:22:30 -05:00
Nate Jensen
338b0ae310 Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]
Former-commit-id: 316d6c09c6
Former-commit-id: a4de603bcf
2013-07-01 14:41:05 -05:00
Steve Harris
2487a8b435 13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
2013-06-28 09:46:25 -04:00
Dustin Johnson
fe8c0b47d1 Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]
Former-commit-id: fac7d3a9d9
Former-commit-id: 5bfef9bb45
2013-06-25 08:33:55 -05:00
Richard Peter
cf29af8d65 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]
Former-commit-id: d262c02612
Former-commit-id: ad353c34f9
2013-06-24 18:51:56 -05:00
Dustin Johnson
e8511a53ad Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]
Former-commit-id: 9bc7c854ab
Former-commit-id: b9d8e444b3
2013-06-18 12:34:25 -05:00
Brian Clements
92860b0cd7 Issue #2092 added purge results to plugin dao
Alternative purge methods that return the purge results


Former-commit-id: 4fcaedce46 [formerly 41f3b7436e [formerly 9e95df4e45e23d3283c5804eb71bff97e6e406ea]]
Former-commit-id: 41f3b7436e
Former-commit-id: 26be5f79d7
2013-06-12 12:21:08 -05:00
Dustin Johnson
994e45fdca Issue #2090 Improve the performance of Madis purging
Amend: Add note to madisPurgeRules.xml about purge keys

Change-Id: I5c0d86d63e7b725cf2b1e6419c8dfcf6ed8396ef

Former-commit-id: 6b228eca86 [formerly 2aa51f1e5f [formerly 3261439e5230bf9d2f2d7e5e81547ae00d924d1e]]
Former-commit-id: 2aa51f1e5f
Former-commit-id: 1570037bd3
2013-06-11 15:44:53 -05:00
Steve Harris
5d99df9969 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
2013-06-10 15:17:17 -04:00
Dustin Johnson
f3835a5670 Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]
Former-commit-id: c01ea33d5b
Former-commit-id: 54045d6b9b
2013-05-30 17:11:19 -05:00
Dave Hladky
7393abfc91 Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]
Former-commit-id: 1608d407d1
Former-commit-id: c292bf1b55
2013-05-30 17:04:16 -05:00
Nate Jensen
00fbfbe7e5 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: f3258e77f7
Former-commit-id: 740237c317
2013-05-29 16:19:28 -05:00
Dustin Johnson
63ccc2c133 Issue #2038 Fix deleting of multiple subscription types
Update test Spring configurations

Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e

Former-commit-id: ecf3f2e300 [formerly d2d50e7d8b [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]
Former-commit-id: d2d50e7d8b
Former-commit-id: 21b8f03b1f
2013-05-29 15:54:06 -05:00
Nate Jensen
04d6f6654d Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
2013-05-29 14:49:43 -05:00
Benjamin Phillippe
ec9881b914 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]
Former-commit-id: 4747f7d319
Former-commit-id: e16dc02a54
2013-05-29 10:34:22 -05:00
Ben Steffensmeier
c2ca1551f6 Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]
Former-commit-id: 3b6156843e
Former-commit-id: cdf8e7daaa
2013-05-24 16:40:21 -05:00
Nate Jensen
e8ebe1a123 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
2013-05-23 11:20:40 -05:00
Ben Steffensmeier
5219bd8426 Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]
Former-commit-id: 1a31aa2211
Former-commit-id: c11631c7da
2013-05-20 18:00:32 -05:00