Commit graph

590 commits

Author SHA1 Message Date
Lee Venable
2342b84f34 Merge "Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon." into 13.2.1_delivery
Former-commit-id: 52e10c8c8a [formerly 9f222c9643 [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]
Former-commit-id: 9f222c9643
Former-commit-id: c9cd8c4c76
2013-01-29 16:44:53 -06:00
Steve Harris
e6093b159e Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 0505ed0a72
Former-commit-id: e655d297f7
2013-01-29 15:57:21 -06:00
Steve Harris
b84acc06da 13.2.1-3 baseline
Former-commit-id: 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: f45120a1f4
Former-commit-id: 283147571f
2013-01-29 15:52:43 -06:00
Dustin Johnson
8897d2b302 Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: 4e9ecdf166 [formerly b0125d6d7e [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]
Former-commit-id: b0125d6d7e
Former-commit-id: c8302eb9f8
2013-01-29 10:10:54 -06:00
Lee Venable
b35b20a245 Merge "Issue #1528 Fix subscription priorities to be the same from domain object to GUI Fix incorrect use of enum ordinal value mappings to priorities. Fix broken bandwidth priority scheduling." into 13.2.1_delivery
Former-commit-id: f98e5b35e1 [formerly 06900ccbb7 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]
Former-commit-id: 06900ccbb7
Former-commit-id: ef51b388d7
2013-01-29 09:59:59 -06:00
Lee Venable
9493ce7146 Merge "Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids" into 13.2.1_delivery
Former-commit-id: 71da745d93 [formerly 85cff28b91 [formerly a997bb9673162b8860ec9bd61118a52a575d4693]]
Former-commit-id: 85cff28b91
Former-commit-id: 7d459d4d26
2013-01-29 09:59:06 -06:00
Max Schenkelberg
681a2a6ec4 Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon.
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d

Former-commit-id: 1dbeeb84fb [formerly 95ccc76272 [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]
Former-commit-id: 95ccc76272
Former-commit-id: 796522b6d0
2013-01-28 14:30:53 -06:00
Richard Peter
b2ebea951c Issue #1408: Merge branch 'ss_builds' (13.2.1) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.datadelivery.feature/feature.xml
	cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/UserSelectComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/services/DataDeliveryServices.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/DeleteGroupDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/GroupAddDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/RequestFromServerPermissionsService.java
	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/SubscriptionService.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/SubApprovalTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/presenter/CreateSubscriptionDlgPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/VerticalSubsetTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/presenter/GriddedTimingSelectionPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/xml/SubsetXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/OperatorAdapter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/CreateEditRuleDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/Operator.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemLatencyTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemManagementDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemPriorityTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemRuleManager.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataSetFrequency.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/NotificationHandler.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFELegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/DiscreteColorbar.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/MenuLoader.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.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.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/utility/common_static/base/datadelivery/systemManagement/rules/latencyRules.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Ensemble.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSet.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSetMetaData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Parameter.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Provider.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/DataSizeUtils.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/LookupManager.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ExtensibleObjectType.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/SubscriptionNotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/MainSequenceCrawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/OPENDAPServiceConfig.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/harvester/NOMADS-harvester.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtility.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRequestBuilder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalGenerator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	nativeLib/org.apache.qpid/lib/libqpidclient.so
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	tests/.classpath
	tests/unit/com/raytheon/uf/common/datadelivery/registry/OpenDapGriddedDataSetFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderTest.java
	tests/unit/com/raytheon/uf/common/localization/TestPathManager.java
	tests/unit/com/raytheon/uf/common/registry/RegistryManagerTest.java
	tests/unit/com/raytheon/uf/common/stats/data/DataPointTest.java
	tests/unit/com/raytheon/uf/common/stats/data/StatsDataTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/harvester/CrawlerTest.java
	tests/unit/com/raytheon/uf/edex/stats/data/StatsDataAccumulatorTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXMLTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/utils/DataSizeUtilTest.java

Former-commit-id: 81f14729ae [formerly 116ed10973 [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]
Former-commit-id: 116ed10973
Former-commit-id: 094fab7d16
2013-01-25 15:54:27 -06:00
Dustin Johnson
f8d6fb35b4 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]
Former-commit-id: 41c0ff85ff
Former-commit-id: 50bfcd3fbf
2013-01-25 14:30:04 -06:00
Dave Hladky
01331e8d69 Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids
Change-Id: I326a25c3608d934d1b0183f2ad34109ab68e59f8

Former-commit-id: 04a955ff53 [formerly b1dddd37a6 [formerly d29ebdf1323d836b2f1e254cdcb1da06fdb5da61]]
Former-commit-id: b1dddd37a6
Former-commit-id: fe864302d2
2013-01-25 10:58:22 -06:00
Lee Venable
5759947256 Merge "Issue #1495 fix fens regex." into 13.2.1_delivery
Former-commit-id: e49a718462 [formerly 79fca0b122 [formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]
Former-commit-id: 79fca0b122
Former-commit-id: 8d19ab695a
2013-01-25 10:46:40 -06:00
Steve Harris
74bfe9595c 13.2.1-2 baseline
Former-commit-id: c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: 7a7f7c45ca
Former-commit-id: 0006a2b6cb
2013-01-25 09:07:12 -06:00
Lee Venable
695f441e3f Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: e4142b63c9 [formerly 9756c431fd [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]
Former-commit-id: 9756c431fd
Former-commit-id: 0767f1a50b
2013-01-24 16:52:17 -06:00
Benjamin Phillippe
8bad25fac2 Issue #1525 Improved Dataset Discovery Browser query performance
Change-Id: Ic7c7994e5768238393c1fdbb73ec043cc1eb86f1

Former-commit-id: bcd7e5629f [formerly 49c66d2e47 [formerly b112d2eba2395f693beedd64ca97c140cba161f1]]
Former-commit-id: 49c66d2e47
Former-commit-id: eaeceb82cf
2013-01-24 13:17:28 -06:00
Mike Duff
ed32adc993 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]
Former-commit-id: ba5014b162
Former-commit-id: 478ec72102
2013-01-24 12:39:12 -06:00
Ben Steffensmeier
314f90d933 Issue #1495 fix fens regex.
Former-commit-id: 2cb3fe3dc2 [formerly e28749bc03 [formerly fda3d6ae8ecd44d03b9c4afb1fd0b93b0f3aaccf]]
Former-commit-id: e28749bc03
Former-commit-id: 37d712231a
2013-01-24 10:53:51 -06:00
Mike Duff
4186b10583 Issue #1523 - Finalize registry and data delivery stats
Former-commit-id: 561e83454f [formerly 9c033e6484 [formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]
Former-commit-id: 9c033e6484
Former-commit-id: cbfd355219
2013-01-23 14:40:23 -06:00
Mike Duff
d54b3a3519 Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]
Former-commit-id: ffca969560
Former-commit-id: 712862d96f
2013-01-23 11:17:36 -06:00
Dustin Johnson
0f7b01795d Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]
Former-commit-id: 6c1818d544
Former-commit-id: 504268f0f3
2013-01-23 08:06:52 -06:00
Nate Jensen
a2b66980dd Merge "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." into 13.2.1_delivery
Former-commit-id: 6e89f547e5 [formerly 2059b9a962 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]
Former-commit-id: 2059b9a962
Former-commit-id: ca7ecbb38a
2013-01-22 18:05:00 -06:00
Ron Anderson
d2a7bb20e6 Merge "Issue #1504 Fix merge error" into 13.2.1_delivery
Former-commit-id: b7abb8d4e4 [formerly a1d7a1cbc9 [formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]
Former-commit-id: a1d7a1cbc9
Former-commit-id: abb36c3114
2013-01-22 17:50:40 -06:00
Ron Anderson
5e5d27a9a7 Issue #1504 Fix merge error
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: 2f4badad98 [formerly c83667e9b5 [formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]
Former-commit-id: c83667e9b5
Former-commit-id: 5c6af0d0a1
2013-01-22 16:54:04 -06:00
Lee Venable
f5ac31bcde Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery
Former-commit-id: b945ce9e6e [formerly 619349b140 [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]
Former-commit-id: 619349b140
Former-commit-id: aecd00423a
2013-01-22 16:26:48 -06:00
Mike Duff
01126a7f47 Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

Former-commit-id: 96e2192585 [formerly fc4a6264f6 [formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]
Former-commit-id: fc4a6264f6
Former-commit-id: e5e7bc1047
2013-01-22 14:57:23 -06:00
Ron Anderson
6f980bd582 Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 20b0761048 [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]
Former-commit-id: 62671efc2a
Former-commit-id: 74cb9aeb53
2013-01-22 14:47:37 -06:00
Dustin Johnson
40ef4c5947 Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 15c2c55ff9 [formerly 557de162b0 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]
Former-commit-id: 557de162b0
Former-commit-id: 3ec05a5a9c
2013-01-22 11:45:18 -06:00
Dustin Johnson
491a095bed Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 2eda48aa0d [formerly 0281da10cc [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]
Former-commit-id: 0281da10cc
Former-commit-id: 94a0cd5733
2013-01-21 21:24:48 -06:00
Max Schenkelberg
1944f4f81d 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: 6fd6b2e42d [formerly 5c51083f35 [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]
Former-commit-id: 5c51083f35
Former-commit-id: 8058260830
2013-01-21 14:58:16 -06:00
Dustin Johnson
be213b454c Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery
Former-commit-id: 350becc94f [formerly c1f03f7d81 [formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]
Former-commit-id: c1f03f7d81
Former-commit-id: 04398e0aa4
2013-01-21 12:23:08 -06:00
Dave Hladky
da08fa1186 Issue #1513 Updated the way level lookups are created
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555

Former-commit-id: cf1c674c2e [formerly 53ceda6a62 [formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]
Former-commit-id: 53ceda6a62
Former-commit-id: d0ff35051e
2013-01-21 11:19:00 -06:00
Dave Hladky
280a3e30c1 Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets.
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173

Former-commit-id: 5d8851b214 [formerly 786afee256 [formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]
Former-commit-id: 786afee256
Former-commit-id: 1c39b88ba4
2013-01-21 08:29:29 -06:00
Richard Peter
8c8a94d567 Merge "Issue #1495 add ensemble selection tab to subset dialog Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15" into 13.2.1_delivery
Former-commit-id: 9feb73c161 [formerly 76f9e42fd3 [formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]
Former-commit-id: 76f9e42fd3
Former-commit-id: ac3b484474
2013-01-18 15:43:16 -06:00
Ben Steffensmeier
e708ba4f52 Issue #1495 add ensemble selection tab to subset dialog
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15

Former-commit-id: 14f3c3b3bf [formerly f0d1c1a737 [formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]
Former-commit-id: f0d1c1a737
Former-commit-id: d06ef00715
2013-01-18 15:42:08 -06:00
Richard Peter
e3bd3302be Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
Former-commit-id: bf18ba9214 [formerly 9f9020db61 [formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]
Former-commit-id: 9f9020db61
Former-commit-id: 7cc497c663
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
2eaa5373a9 Issue #1495 enable ensemble subset requests in opendap.
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a

Former-commit-id: 94ba8511cb [formerly eb821d7580 [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]
Former-commit-id: eb821d7580
Former-commit-id: 928cb3b00f
2013-01-18 14:58:10 -06:00
Greg Armendariz
5c7bb26fb6 Merge "Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time" into 13.2.1_delivery
Former-commit-id: f7b046fa0d [formerly 9d06f6ed6d [formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]
Former-commit-id: 9d06f6ed6d
Former-commit-id: edda76ad75
2013-01-18 14:30:12 -06:00
Richard Peter
8269ba554b Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd

Former-commit-id: af105bfe0f [formerly a1c58ab36d [formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]
Former-commit-id: a1c58ab36d
Former-commit-id: b83e46a345
2013-01-18 13:55:56 -06:00
Nate Jensen
bd08d7a537 Issue #1497 fix build
Former-commit-id: b52aa82213 [formerly 6e0f0d330e [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]
Former-commit-id: 6e0f0d330e
Former-commit-id: 13b5619297
2013-01-17 18:42:38 -06:00
Richard Peter
be6d4cceeb Merge "Issue #1501 Use registry version of subscription when sending notification responses" into 13.2.1_delivery
Former-commit-id: f2ed67c841 [formerly 08e7ce3da9 [formerly 05dde10fa4bab4b93f7a2f25c368a2a99acae581]]
Former-commit-id: 08e7ce3da9
Former-commit-id: f553d99665
2013-01-17 17:06:52 -06:00
Nate Jensen
bcd008737b Issue #1497 ported python fillEditArea to Java to boost speed
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36

Former-commit-id: 15e1731ef3 [formerly 278ea6d24e [formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]
Former-commit-id: 278ea6d24e
Former-commit-id: 449b3735f0
2013-01-17 16:14:56 -06:00
Dustin Johnson
5ce7601dfa Issue #1501 Use registry version of subscription when sending notification responses
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 38036a0e8b [formerly d9064bdc98 [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]
Former-commit-id: d9064bdc98
Former-commit-id: 9f775d2dd7
2013-01-17 14:53:36 -06:00
Dustin Johnson
088b0d4c08 Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: 037dabb683 [formerly 74d5a70c30 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]
Former-commit-id: 74d5a70c30
Former-commit-id: b1ce19e41d
2013-01-17 12:48:01 -06:00
Nate Jensen
c8a54dc15c Merge "Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter" into 13.2.1_delivery
Former-commit-id: 391a179bdb [formerly cd45e662fd [formerly 3824077f84deb52ee2d7adc7b19f5134e6788ddb]]
Former-commit-id: cd45e662fd
Former-commit-id: 40ebb52178
2013-01-17 09:27:52 -06:00
Brad Gonzales
4c2cf80f5d Issue #1448 Added app context checks to ArealQpeGenSrv MpeLightningSrv. Uncommented run_report_alarm call in run_alarm_whfs. Moved internal methods to private in MpeRUCFreezingLevel.
Amend: removed log statments from run_alarm_whfs based on review comments.
       removed tab.

Change-Id: I05cd853814376bfb0ac61e3340210be928a35c57

Former-commit-id: 69eccc1d80 [formerly 31c48be1c5 [formerly 86c094b2d301dbf6ead2d74bc64b3596cf2ef6d8]]
Former-commit-id: 31c48be1c5
Former-commit-id: 1a3e279226
2013-01-16 15:23:53 -06:00
Richard Peter
7dab4209b8 Merge "Issue #1420 - More Rules changes. Peer review comments" into 13.2.1_delivery
Former-commit-id: 86acbf5470 [formerly f6749331c9 [formerly fc818294ba14c7b957cf6aedae153d3a18b5219b]]
Former-commit-id: f6749331c9
Former-commit-id: 6bc65147b3
2013-01-16 15:08:37 -06:00
Mike Duff
5210083e95 Issue #1420 - More Rules changes.
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 8d0a79703f [formerly 2a31447d6d [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]
Former-commit-id: 2a31447d6d
Former-commit-id: 1df1b5a94d
2013-01-16 14:34:55 -06:00
Richard Peter
5b35bf0fca Merge "Issue #1493 fix grib2 decoder to handle ensembles" into 13.2.1_delivery
Former-commit-id: b98ed1f8e7 [formerly 276fee1b70 [formerly 8b0a1178ecd824a3b7f399a187f5c152025aa58e]]
Former-commit-id: 276fee1b70
Former-commit-id: 312b786d02
2013-01-16 12:41:32 -06:00
Dustin Johnson
0397f990da Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: 19d3a14d4f [formerly b627dfc054 [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]
Former-commit-id: b627dfc054
Former-commit-id: c12b46027f
2013-01-16 12:21:11 -06:00
Ben Steffensmeier
e2f2c05dbf Issue #1493 fix grib2 decoder to handle ensembles
Former-commit-id: 4595797f5f [formerly 7d155653bc [formerly c694df943bb70f2903fe495400061444a67d3357]]
Former-commit-id: 7d155653bc
Former-commit-id: 02e0433afc
2013-01-15 18:08:19 -06:00
Richard Peter
853f62e60d Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
Former-commit-id: 0e684515c6 [formerly 09fb2d0919 [formerly 8388122d8273aca20a9c4292035049957a091a69]]
Former-commit-id: 09fb2d0919
Former-commit-id: e8a4939150
2013-01-15 16:11:35 -06:00