Commit graph

609 commits

Author SHA1 Message Date
Roger Ferrel
234b632c75 Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.)
Changes to use fewer synchronized blocks.

Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a

Former-commit-id: 97b6a1a810 [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: 4dbb053d65
2013-01-30 13:11:56 -06:00
Nate Jensen
2c85ed97e3 Issue #1526 improved exception handling per code review comments
Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

Former-commit-id: d155f573c9 [formerly 471dd02143] [formerly 530fdbe151 [formerly 6abffb7aeb4011db9f6380fc644312b408bb75fa]]
Former-commit-id: 530fdbe151
Former-commit-id: d233055696
2013-01-29 09:25:19 -06:00
Steve Harris
27725703d5 Merge branch '13.2.1_delivery' into development
Former-commit-id: ef2526ed44 [formerly 6bd7e027b6] [formerly b5b1823104 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]
Former-commit-id: b5b1823104
Former-commit-id: 0a31815c66
2013-01-28 16:28:58 -06:00
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
Richard Peter
74b80fdc81 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: 094fab7d16 [formerly 116ed10973] [formerly 81f14729ae [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]
Former-commit-id: 81f14729ae
Former-commit-id: d0e3bbf826
2013-01-25 15:54:27 -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
Lee Venable
4c07c59837 Merge "Issue #1495 fix fens regex." into 13.2.1_delivery
Former-commit-id: 8d19ab695a [formerly 79fca0b122] [formerly e49a718462 [formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]
Former-commit-id: e49a718462
Former-commit-id: d04924fd3a
2013-01-25 10:46:40 -06:00
Steve Harris
251a9c0195 13.2.1-2 baseline
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
2013-01-25 09:07:12 -06:00
Lee Venable
4bf28dd204 Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 0767f1a50b [formerly 9756c431fd] [formerly e4142b63c9 [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]
Former-commit-id: e4142b63c9
Former-commit-id: 063ffa26eb
2013-01-24 16:52:17 -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
Steve Harris
bd1393541a Merge "Issue #1496 Changes to move what may be long queries off the UI thread. Changed based on comments in patch set 2." into development
Former-commit-id: 88734ab106 [formerly ca23ba06e5] [formerly 267d860cd1 [formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]
Former-commit-id: 267d860cd1
Former-commit-id: 9b3713763d
2013-01-24 15:02:36 -06:00
Benjamin Phillippe
98cd7c4339 Issue #1525 Improved Dataset Discovery Browser query performance
Change-Id: Ic7c7994e5768238393c1fdbb73ec043cc1eb86f1

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

Former-commit-id: 478ec72102 [formerly ba5014b162] [formerly c06ed9f9dc [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]
Former-commit-id: c06ed9f9dc
Former-commit-id: fbf92a6d06
2013-01-24 12:39:12 -06:00
Ben Steffensmeier
07d1695d81 Issue #1495 fix fens regex.
Former-commit-id: 37d712231a [formerly e28749bc03] [formerly 2cb3fe3dc2 [formerly fda3d6ae8ecd44d03b9c4afb1fd0b93b0f3aaccf]]
Former-commit-id: 2cb3fe3dc2
Former-commit-id: 243af2b479
2013-01-24 10:53:51 -06:00
Mike Duff
7e421afc03 Issue #1523 - Finalize registry and data delivery stats
Former-commit-id: cbfd355219 [formerly 9c033e6484] [formerly 561e83454f [formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]
Former-commit-id: 561e83454f
Former-commit-id: 29939914a2
2013-01-23 14:40:23 -06:00
Roger Ferrel
3daf0c7b37 Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.

Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce

Former-commit-id: 3abb6f1026 [formerly ff09ee32ab] [formerly 470abe2495 [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]
Former-commit-id: 470abe2495
Former-commit-id: 58e3bbbe97
2013-01-23 14:08:46 -06:00
Ben Steffensmeier
e59bb3c914 Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: bd32a947c7 [formerly a19b51cf2e] [formerly 3032dc2189 [formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]
Former-commit-id: 3032dc2189
Former-commit-id: 2e907f4a0e
2013-01-23 11:39:52 -06:00
Mike Duff
dfcce57a0a Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

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

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 504268f0f3 [formerly 6c1818d544] [formerly f730422834 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]
Former-commit-id: f730422834
Former-commit-id: 516ac1ab9a
2013-01-23 08:06:52 -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
Ron Anderson
cfeab572a2 Issue #1504 Fix merge error
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: c165cd4e3b [formerly b5fd4e6226] [formerly cac86a904d [formerly 71aca907a76084392402160005bbeb157cfddfc4]]
Former-commit-id: cac86a904d
Former-commit-id: 68af35c524
2013-01-22 18:22:19 -06:00
Nate Jensen
0ede688235 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: ca7ecbb38a [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]
Former-commit-id: 6e89f547e5
Former-commit-id: ab30ace9ce
2013-01-22 18:05:00 -06:00
Ron Anderson
e9855ab55a Merge "Issue #1504 Fix merge error" into 13.2.1_delivery
Former-commit-id: abb36c3114 [formerly a1d7a1cbc9] [formerly b7abb8d4e4 [formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]
Former-commit-id: b7abb8d4e4
Former-commit-id: 8fb70d5ddc
2013-01-22 17:50:40 -06:00
Ron Anderson
cb3e710d4c Issue #1504 Fix merge error
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6

Former-commit-id: 5c6af0d0a1 [formerly c83667e9b5] [formerly 2f4badad98 [formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]
Former-commit-id: 2f4badad98
Former-commit-id: 8e15531e08
2013-01-22 16:54:04 -06:00
Steve Harris
8b578c10dc Merge branch '13.2.1_delivery' into development
Former-commit-id: cf384edfbb [formerly 11b9bfc187] [formerly 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]]
Former-commit-id: 1af055a04b
Former-commit-id: 29b9077291
2013-01-22 16:45:48 -06:00
Lee Venable
bc10a17c9f 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: aecd00423a [formerly 619349b140] [formerly b945ce9e6e [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]
Former-commit-id: b945ce9e6e
Former-commit-id: 511a7d9753
2013-01-22 16:26:48 -06:00
Mike Duff
0ffc71147e Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

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

Former-commit-id: 74cb9aeb53 [formerly 62671efc2a] [formerly 20b0761048 [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]
Former-commit-id: 20b0761048
Former-commit-id: 44807ba0d5
2013-01-22 14:47:37 -06:00
Dustin Johnson
756080321e 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: 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]
Former-commit-id: 15c2c55ff9
Former-commit-id: a3c99f86bb
2013-01-22 11:45:18 -06:00
Steve Harris
5b516ebb6f Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java

Former-commit-id: 340d2009f7 [formerly df9ac3685e] [formerly 3a772f41cf [formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]
Former-commit-id: 3a772f41cf
Former-commit-id: 111d5afb3a
2013-01-22 09:40:50 -06:00
Dustin Johnson
58b3edd7df Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 94a0cd5733 [formerly 0281da10cc] [formerly 2eda48aa0d [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]
Former-commit-id: 2eda48aa0d
Former-commit-id: c7189052e8
2013-01-21 21:24:48 -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
Dustin Johnson
8aed30442e Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery
Former-commit-id: 04398e0aa4 [formerly c1f03f7d81] [formerly 350becc94f [formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]
Former-commit-id: 350becc94f
Former-commit-id: aa85e0c3ca
2013-01-21 12:23:08 -06:00
Nate Jensen
8f93ca0ed3 Merge "Issue #1446 add getLatCoords and getLonCoords to python data access framework" into development
Former-commit-id: 0edf7d7c9f [formerly e0896d8b5d] [formerly ec1d35251c [formerly 06dfa2bba6f7d061b43783e9029b164ad208b6fe]]
Former-commit-id: ec1d35251c
Former-commit-id: 2a07d5c89f
2013-01-21 11:55:34 -06:00
Matt Nash
0652c0840d Issue #1446 add getLatCoords and getLonCoords to python data access framework
Change-Id: I292a9b424cadf3033a861d8a0703b2f02946cd4e

Former-commit-id: 34ca95f039 [formerly af22cf8929] [formerly b84af90fc2 [formerly 30ffd1412f3b193ce1fe2560f2ecf29027e7f619]]
Former-commit-id: b84af90fc2
Former-commit-id: 177d02d01b
2013-01-21 11:51:18 -06:00
Nate Jensen
e0452a81c7 Merge "Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
Former-commit-id: d725a23922 [formerly 36fc48eb53] [formerly d45d793d36 [formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]
Former-commit-id: d45d793d36
Former-commit-id: e969a8c438
2013-01-21 11:42:37 -06:00
Dave Hladky
82cd0a1b58 Issue #1513 Updated the way level lookups are created
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555

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

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

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

Former-commit-id: 928cb3b00f [formerly eb821d7580] [formerly 94ba8511cb [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]
Former-commit-id: 94ba8511cb
Former-commit-id: 7e3b6d12f6
2013-01-18 14:58:10 -06:00
Greg Armendariz
817162c467 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: edda76ad75 [formerly 9d06f6ed6d] [formerly f7b046fa0d [formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]
Former-commit-id: f7b046fa0d
Former-commit-id: dda78c073a
2013-01-18 14:30:12 -06:00
Richard Peter
ee9adb9764 Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd

Former-commit-id: b83e46a345 [formerly a1c58ab36d] [formerly af105bfe0f [formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]
Former-commit-id: af105bfe0f
Former-commit-id: f5c8534098
2013-01-18 13:55:56 -06:00
Steve Harris
0ca985778e Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: 89f3120c0c [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]
Former-commit-id: 407d73a04f
Former-commit-id: bbb637faf3
2013-01-18 10:52:29 -06:00
Nate Jensen
cc0725f0b7 Issue #1497 fix build
Former-commit-id: 13b5619297 [formerly 6e0f0d330e] [formerly b52aa82213 [formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]
Former-commit-id: b52aa82213
Former-commit-id: 98ec6fcc1c
2013-01-17 18:42:38 -06:00
David Gillingham
09836dacca Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: 9e3999a427 [formerly c6e64d83a2] [formerly d16760c73e [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]
Former-commit-id: d16760c73e
Former-commit-id: a40383de3b
2013-01-17 17:42:05 -06:00
Richard Peter
a41c4056af Merge "Issue #1501 Use registry version of subscription when sending notification responses" into 13.2.1_delivery
Former-commit-id: f553d99665 [formerly 08e7ce3da9] [formerly f2ed67c841 [formerly 05dde10fa4bab4b93f7a2f25c368a2a99acae581]]
Former-commit-id: f2ed67c841
Former-commit-id: 683fdaf376
2013-01-17 17:06:52 -06:00
Nate Jensen
492634b6f5 Issue #1497 ported python fillEditArea to Java to boost speed
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36

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

Former-commit-id: 9f775d2dd7 [formerly d9064bdc98] [formerly 38036a0e8b [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]
Former-commit-id: 38036a0e8b
Former-commit-id: 13a75fabad
2013-01-17 14:53:36 -06:00