Commit graph

143 commits

Author SHA1 Message Date
Richard Peter
7c9b9b0237 Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: 59ef7758f1 [formerly 6eb11703e4] [formerly 2946e97294 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]
Former-commit-id: 2946e97294
Former-commit-id: 878cbe1695
2013-01-28 15:27:23 -06:00
Steve Harris
a85c81289e Merge branch '13.2.1_delivery' into development
Former-commit-id: 618cf868c5 [formerly f673583915] [formerly 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]
Former-commit-id: 827611474f
Former-commit-id: 25fecb8b4f
2013-01-25 10:54:51 -06:00
Nate Jensen
04a397866a Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: c7172e87a3 [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]
Former-commit-id: 2dc3abb847
Former-commit-id: fa27552c9b
2013-01-24 16:41:02 -06:00
Max Schenkelberg
ecce9be8ce Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: a8dc166a1f [formerly 9655d64069] [formerly b6a29c38a5 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]
Former-commit-id: b6a29c38a5
Former-commit-id: 11c8dd6fff
2013-01-23 16:50:17 -06:00
Steve Harris
764efdb8b8 Merge branch '13.2.1_delivery' into development
Former-commit-id: cbffccc58e [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]
Former-commit-id: 9b6cc68601
Former-commit-id: c7148da94d
2013-01-22 21:47:09 -06:00
Max Schenkelberg
3d459dd57c Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized.
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 8058260830 [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 2c05f3c179
2013-01-21 14:58:16 -06:00
Ben Steffensmeier
50d1561165 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: a9654f859a [formerly f0af056d97] [formerly ec199ad7d1 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]
Former-commit-id: ec199ad7d1
Former-commit-id: 3bfba5b771
2013-01-18 10:59:43 -06:00
Roger Ferrel
86d51634dc Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 972db12324 [formerly 1cd076671c] [formerly 1e492b81ff [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]
Former-commit-id: 1e492b81ff
Former-commit-id: f10521f861
2013-01-16 16:53:29 -06:00
Steve Harris
b8ab464cee Merge branch '13.2.1_delivery' into development
Former-commit-id: 79e7b50d94 [formerly 8c447659ff] [formerly 483e55bcef [formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]
Former-commit-id: 483e55bcef
Former-commit-id: 2e34a82690
2013-01-16 12:03:50 -06:00
Bryan Kowal
38480e46b1 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: 4db9c6c321
Former-commit-id: c1330e8121
2013-01-15 14:56:01 -06:00
Lee Venable
c4291fcb2a Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: a3c5aded12 [formerly 32692a6def] [formerly f63da5aba6 [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]
Former-commit-id: f63da5aba6
Former-commit-id: 5a733e465d
2013-01-15 14:47:49 -06:00
Max Schenkelberg
410abb1144 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: 9aac1d2871 [formerly 02e7c79de9] [formerly aa88b83859 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]
Former-commit-id: aa88b83859
Former-commit-id: c6b6823228
2013-01-15 14:13:36 -06:00
Ben Steffensmeier
3d63fa24a1 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: da79be73a2 [formerly f49e77f7df] [formerly 2e10a8408b [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]
Former-commit-id: 2e10a8408b
Former-commit-id: 0a0d230091
2013-01-14 17:44:46 -06:00
Ben Steffensmeier
c1ae999c81 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: e00348a124 [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]
Former-commit-id: ac9ba67919
Former-commit-id: 147a379a81
2013-01-14 14:30:17 -06:00
Ben Steffensmeier
3b72ea7f19 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: 6e7b5a0e3d [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]
Former-commit-id: a1afabe4e3
Former-commit-id: 7b6bc3f69b
2013-01-11 11:46:32 -06:00
Ron Anderson
2c364744bb Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 37d6ed5232 [formerly 145665c496] [formerly 3df3cf7f7b [formerly cae505a088e959670f4cacb92e439a82f13559b9]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 1f298b87b5
2013-01-10 10:00:56 -06:00
Richard Peter
80bf1d7a28 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
2013-01-09 17:55:05 -06:00
Dustin Johnson
cdf08ea65a Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: f5f6884b79 [formerly 452729a647] [formerly 19f1b30437 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]
Former-commit-id: 19f1b30437
Former-commit-id: 818664e557
2013-01-04 12:34:43 -06:00
Dustin Johnson
853ea19014 Issue #1449 Add interface in front of VizApp task running methods
Change-Id: I4696782d800a836f347cf72738c6c0673314a492

Former-commit-id: f6e081d331 [formerly b9c9030d05] [formerly dc61af2dea [formerly 3ed5c31344148559c0e5479f4b7955fcee7cb0a7]]
Former-commit-id: dc61af2dea
Former-commit-id: 19cdf2f57c
2013-01-02 11:01:15 -06:00
Max Schenkelberg
886c39f5a4 Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 14f102d8ae [formerly b4952b003a] [formerly 373de78320 [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]
Former-commit-id: 373de78320
Former-commit-id: adf6aed592
2012-12-17 17:05:34 -06:00
Max Schenkelberg
d43e0c1c25 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]
Former-commit-id: 5db71ca943
Former-commit-id: b74d788909
2012-12-12 11:39:32 -06:00
Steve Harris
15849ae72a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]
Former-commit-id: ce72ebb094
Former-commit-id: 113fdcb679
2012-12-11 08:56:54 -06:00
Steve Harris
f02c1ef71d Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
2012-12-11 08:45:53 -06:00
Nate Jensen
7c0941e292 Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 851f8977f3 [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]
Former-commit-id: 03e6f7ee16
Former-commit-id: 496fa1ede9
2012-12-07 11:59:13 -06:00
Ron Anderson
c5b3111795 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 45914e0a46 [formerly bb163074fa] [formerly b6fcd999f4 [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]
Former-commit-id: b6fcd999f4
Former-commit-id: 70cca3900b
2012-12-06 17:02:56 -06:00
Ron Anderson
d42afa44dc Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 330e913cb2 [formerly 5143e82d4a] [formerly 9398573f2f [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]
Former-commit-id: 9398573f2f
Former-commit-id: 10479a1909
2012-12-06 15:38:04 -06:00
Dustin Johnson
5953c5372f Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: 6d1831b002 [formerly bba092f51e] [formerly 529238d010 [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]
Former-commit-id: 529238d010
Former-commit-id: 1b165c8e73
2012-12-03 12:06:32 -06:00
Max Schenkelberg
f681c1304c Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: ed77d56a84
Former-commit-id: b24440cc37
2012-11-29 10:29:36 -06:00
Nate Jensen
8a4544a632 Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: cbb77b884b [formerly d76ab40583] [formerly f24fcc07cf [formerly db083d70f18b771740f73ecb787c103b5264881d]]
Former-commit-id: f24fcc07cf
Former-commit-id: 10be056dcb
2012-11-27 09:07:07 -06:00
Dustin Johnson
dd03bf9bd5 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: dd82a472e5 [formerly 13b1683458] [formerly a9d01486ed [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]
Former-commit-id: a9d01486ed
Former-commit-id: 1bb69653af
2012-11-19 13:21:03 -06:00
Dustin Johnson
a448369b44 Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: d1024d091c [formerly 87148a8061] [formerly 8a6be78eb0 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 1d5714b994
2012-11-16 14:43:45 -06:00
Max Schenkelberg
db2fe0b5e8 Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a472f5535b [formerly 655f54b098] [formerly f540f65fd7 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]
Former-commit-id: f540f65fd7
Former-commit-id: f1866b2e49
2012-11-15 16:21:42 -06:00
Max Schenkelberg
5aa26e4f13 Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: fe11e31bfb [formerly dcde9e8951] [formerly 28e61c8285 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: 28e61c8285
Former-commit-id: 2e20c3e799
2012-11-14 16:19:37 -06:00
Max Schenkelberg
4408af827f Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
2012-11-12 16:46:21 -06:00
Dustin Johnson
2d1e886cf3 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Max Schenkelberg
5a5bd522a1 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
2012-11-07 10:44:42 -06:00
Dustin Johnson
e7a0f96a9a Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Steve Harris
31253e2949 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 18ec4b5933 [formerly 34e7b3f4a3] [formerly 8703ff00c7 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]
Former-commit-id: 8703ff00c7
Former-commit-id: dc5eba737d
2012-10-17 08:21:19 -05:00
Steve Harris
d0e91329b4 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
2012-10-16 15:48:14 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Nate Jensen
93143bbda0 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: cbc2da0c06 [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
2012-10-12 15:16:27 -05:00
Roger Ferrel
09bb914dc0 Issue #1248 Changes to allow change listeners on Alter Bundles.
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: 65a19e48b0 [formerly e7d27f4aab] [formerly 03070aded9 [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]
Former-commit-id: 03070aded9
Former-commit-id: f4861554cd
2012-10-10 06:52:09 -05:00
Steve Harris
48a80a23e4 Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: 7be572b27d [formerly 8c97afe03b] [formerly 0895f22690 [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]
Former-commit-id: 0895f22690
Former-commit-id: 8dae024430
2012-10-08 13:29:34 -05:00
Steve Harris
772c60efa4 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
fdddbebddc Issue #1151 move alert parsing into the resource data so that it can clear the time cache for derived alerts.
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8

Former-commit-id: b4d7183cdd [formerly 42ae490a50] [formerly b6e124f830 [formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]
Former-commit-id: b6e124f830
Former-commit-id: 2cdb3553e9
2012-10-05 14:28:35 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
2012-09-27 15:57:45 -05:00
Max Schenkelberg
f0376e0240 Issue #1214 Made VizGlobalsManager check for null window before calling getPage() since getInstance() still returns succesfully when null window is passed in. Change TimeMatchingJob to be shutdown when core plugin stops and cancels existing jobs.
Amend: Removed println

Change-Id: I3559b13074eb025e9bf931685cda3e804037baff

Former-commit-id: 51e565c6ff [formerly 4b2467e639] [formerly edfd7fd22f [formerly fc617c1392d9585d2e91e371af74aad4b24acfbb]]
Former-commit-id: edfd7fd22f
Former-commit-id: 63c30eafc2
2012-09-24 15:39:18 -05:00
Steve Harris
91f26b6c0e Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: c64e9b0ad9 [formerly 72ecefa9ee] [formerly fe92909f53 [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]
Former-commit-id: fe92909f53
Former-commit-id: b8d2ff47ca
2012-09-17 14:58:23 -05:00
Bryan Kowal
9dc8747553 Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: 9915d4c006 [formerly 77d12d0275] [formerly 3a037ffd49 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]
Former-commit-id: 3a037ffd49
Former-commit-id: f516e61f20
2012-09-14 12:25:41 -05:00
Steve Harris
bc86013d8f Merge branch 'development' into Enhanced_points
Former-commit-id: 2e47ad78bc [formerly 321e2191b1] [formerly 6146f56ce4 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]
Former-commit-id: 6146f56ce4
Former-commit-id: 9ca736f901
2012-09-13 15:25:12 -05:00