Steve Harris
7395af8e56
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: ef2526ed44
[formerly 6bd7e027b6
] [formerly ef2526ed44
[formerly 6bd7e027b6
] [formerly b5b1823104
[formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]
Former-commit-id: b5b1823104
Former-commit-id: 27725703d5
[formerly 0a31815c66
]
Former-commit-id: fa305d03ba
2013-01-28 16:28:58 -06:00
Richard Peter
7a41e41ca9
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 59ef7758f1
[formerly 6eb11703e4
] [formerly 2946e97294
[formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 7c9b9b0237
[formerly 878cbe1695
]
Former-commit-id: 4f61e88c6f
2013-01-28 15:27:23 -06:00
Richard Peter
f810e098d0
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 094fab7d16
[formerly 116ed10973
] [formerly 81f14729ae
[formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]
Former-commit-id: 81f14729ae
Former-commit-id: 74b80fdc81
[formerly d0e3bbf826
]
Former-commit-id: 1058dba963
2013-01-25 15:54:27 -06:00
Steve Harris
a7d7847b06
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 618cf868c5
[formerly f673583915
] [formerly 618cf868c5
[formerly f673583915
] [formerly 827611474f
[formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: a85c81289e
[formerly 25fecb8b4f
]
Former-commit-id: 895b25bac4
2013-01-25 10:54:51 -06:00
Lee Venable
c959752c76
Merge "Issue #1495 fix fens regex." into 13.2.1_delivery
...
Former-commit-id: 8d19ab695a
[formerly 79fca0b122
] [formerly 8d19ab695a
[formerly 79fca0b122
] [formerly e49a718462
[formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]]
Former-commit-id: e49a718462
Former-commit-id: 4c07c59837
[formerly d04924fd3a
]
Former-commit-id: 45eaf08797
2013-01-25 10:46:40 -06:00
Steve Harris
eafa141b90
13.2.1-2 baseline
...
Former-commit-id: 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly 0006a2b6cb
[formerly 7a7f7c45ca
] [formerly c3e4551dfa
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195
[formerly 1153d80c5b
]
Former-commit-id: 27706b8dcb
2013-01-25 09:07:12 -06:00
Lee Venable
4a9d05e1f0
Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
...
Former-commit-id: 0767f1a50b
[formerly 9756c431fd
] [formerly 0767f1a50b
[formerly 9756c431fd
] [formerly e4142b63c9
[formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]
Former-commit-id: e4142b63c9
Former-commit-id: 4bf28dd204
[formerly 063ffa26eb
]
Former-commit-id: 18f8246019
2013-01-24 16:52:17 -06:00
Nate Jensen
ddf1360954
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 c7172e87a3
[formerly 705bfb0755
] [formerly 2dc3abb847
[formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 04a397866a
[formerly fa27552c9b
]
Former-commit-id: 8726a77052
2013-01-24 16:41:02 -06:00
Steve Harris
db11a51d8c
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 88734ab106
[formerly ca23ba06e5
] [formerly 267d860cd1
[formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]]
Former-commit-id: 267d860cd1
Former-commit-id: bd1393541a
[formerly 9b3713763d
]
Former-commit-id: ec2aaf2005
2013-01-24 15:02:36 -06:00
Benjamin Phillippe
6f937c7cc0
Issue #1525 Improved Dataset Discovery Browser query performance
...
Change-Id: Ic7c7994e5768238393c1fdbb73ec043cc1eb86f1
Former-commit-id: eaeceb82cf
[formerly 49c66d2e47
] [formerly eaeceb82cf
[formerly 49c66d2e47
] [formerly bcd7e5629f
[formerly b112d2eba2395f693beedd64ca97c140cba161f1]]]
Former-commit-id: bcd7e5629f
Former-commit-id: 98cd7c4339
[formerly 4042027a25
]
Former-commit-id: ea083fe6f9
2013-01-24 13:17:28 -06:00
Mike Duff
0752ecb4f1
Issue #1523 - Fix problem with legend keys.
...
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931
Former-commit-id: 478ec72102
[formerly ba5014b162
] [formerly 478ec72102
[formerly ba5014b162
] [formerly c06ed9f9dc
[formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: 05e9b88566
[formerly fbf92a6d06
]
Former-commit-id: f9b7cae879
2013-01-24 12:39:12 -06:00
Ben Steffensmeier
9e304a42da
Issue #1495 fix fens regex.
...
Former-commit-id: 37d712231a
[formerly e28749bc03
] [formerly 37d712231a
[formerly e28749bc03
] [formerly 2cb3fe3dc2
[formerly fda3d6ae8ecd44d03b9c4afb1fd0b93b0f3aaccf]]]
Former-commit-id: 2cb3fe3dc2
Former-commit-id: 07d1695d81
[formerly 243af2b479
]
Former-commit-id: df72441e79
2013-01-24 10:53:51 -06:00
Mike Duff
ff6de982ca
Issue #1523 - Finalize registry and data delivery stats
...
Former-commit-id: cbfd355219
[formerly 9c033e6484
] [formerly cbfd355219
[formerly 9c033e6484
] [formerly 561e83454f
[formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]]
Former-commit-id: 561e83454f
Former-commit-id: 7e421afc03
[formerly 29939914a2
]
Former-commit-id: c000ee3cd9
2013-01-23 14:40:23 -06:00
Roger Ferrel
067198ca1f
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 3abb6f1026
[formerly ff09ee32ab
] [formerly 470abe2495
[formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]]
Former-commit-id: 470abe2495
Former-commit-id: 3daf0c7b37
[formerly 58e3bbbe97
]
Former-commit-id: e0c01d6c04
2013-01-23 14:08:46 -06:00
Ben Steffensmeier
20a08fcc2c
Issue #1521 create grid data access factory and refactor satellite to share common functionality.
...
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf
Former-commit-id: bd32a947c7
[formerly a19b51cf2e
] [formerly bd32a947c7
[formerly a19b51cf2e
] [formerly 3032dc2189
[formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]]
Former-commit-id: 3032dc2189
Former-commit-id: e59bb3c914
[formerly 2e907f4a0e
]
Former-commit-id: fc7b0393c5
2013-01-23 11:39:52 -06:00
Mike Duff
df41fe4395
Issue #1357 - Remaining stats items implemented.
...
Peer Review Fixes
Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1
Former-commit-id: 712862d96f
[formerly ffca969560
] [formerly 712862d96f
[formerly ffca969560
] [formerly 1bc6e7c2e4
[formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: dfcce57a0a
[formerly 4cd7deb608
]
Former-commit-id: ac9f95d1d0
2013-01-23 11:17:36 -06:00
Dustin Johnson
4cec3d4356
Issue #1519 Fix max latency calculations for adhoc queries
...
Amend:
Peer review comments.
Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c
Former-commit-id: 504268f0f3
[formerly 6c1818d544
] [formerly 504268f0f3
[formerly 6c1818d544
] [formerly f730422834
[formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]
Former-commit-id: f730422834
Former-commit-id: 2e09d46fea
[formerly 516ac1ab9a
]
Former-commit-id: 7918b009ff
2013-01-23 08:06:52 -06:00
Steve Harris
7063a0c8d2
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: cbffccc58e
[formerly 1718a19f2d
] [formerly cbffccc58e
[formerly 1718a19f2d
] [formerly 9b6cc68601
[formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]
Former-commit-id: 9b6cc68601
Former-commit-id: 764efdb8b8
[formerly c7148da94d
]
Former-commit-id: 6964c16be7
2013-01-22 21:47:09 -06:00
Ron Anderson
33bd709957
Issue #1504 Fix merge error
...
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6
Former-commit-id: c165cd4e3b
[formerly b5fd4e6226
] [formerly c165cd4e3b
[formerly b5fd4e6226
] [formerly cac86a904d
[formerly 71aca907a76084392402160005bbeb157cfddfc4]]]
Former-commit-id: cac86a904d
Former-commit-id: cfeab572a2
[formerly 68af35c524
]
Former-commit-id: af348cb53a
2013-01-22 18:22:19 -06:00
Nate Jensen
d61e8b9cdb
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 ca7ecbb38a
[formerly 2059b9a962
] [formerly 6e89f547e5
[formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]
Former-commit-id: 6e89f547e5
Former-commit-id: 0ede688235
[formerly ab30ace9ce
]
Former-commit-id: 9494e5b520
2013-01-22 18:05:00 -06:00
Ron Anderson
38e4a75c49
Merge "Issue #1504 Fix merge error" into 13.2.1_delivery
...
Former-commit-id: abb36c3114
[formerly a1d7a1cbc9
] [formerly abb36c3114
[formerly a1d7a1cbc9
] [formerly b7abb8d4e4
[formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]]
Former-commit-id: b7abb8d4e4
Former-commit-id: e9855ab55a
[formerly 8fb70d5ddc
]
Former-commit-id: 05de6bdf6b
2013-01-22 17:50:40 -06:00
Ron Anderson
cb3ccc4533
Issue #1504 Fix merge error
...
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6
Former-commit-id: 5c6af0d0a1
[formerly c83667e9b5
] [formerly 5c6af0d0a1
[formerly c83667e9b5
] [formerly 2f4badad98
[formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]]
Former-commit-id: 2f4badad98
Former-commit-id: cb3e710d4c
[formerly 8e15531e08
]
Former-commit-id: 6b2815a40c
2013-01-22 16:54:04 -06:00
Steve Harris
c60051d5df
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: cf384edfbb
[formerly 11b9bfc187
] [formerly cf384edfbb
[formerly 11b9bfc187
] [formerly 1af055a04b
[formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: 8b578c10dc
[formerly 29b9077291
]
Former-commit-id: b03d5ce450
2013-01-22 16:45:48 -06:00
Lee Venable
fdd9368038
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 aecd00423a
[formerly 619349b140
] [formerly b945ce9e6e
[formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]
Former-commit-id: b945ce9e6e
Former-commit-id: bc10a17c9f
[formerly 511a7d9753
]
Former-commit-id: 1dd4ad4b00
2013-01-22 16:26:48 -06:00
Mike Duff
3f25b13a11
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 e5e7bc1047
[formerly fc4a6264f6
] [formerly 96e2192585
[formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]]
Former-commit-id: 96e2192585
Former-commit-id: 0ffc71147e
[formerly d62088cb0c
]
Former-commit-id: 8f388537eb
2013-01-22 14:57:23 -06:00
Ron Anderson
64d4baf536
Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
...
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58
Former-commit-id: 74cb9aeb53
[formerly 62671efc2a
] [formerly 74cb9aeb53
[formerly 62671efc2a
] [formerly 20b0761048
[formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]
Former-commit-id: 20b0761048
Former-commit-id: 8e575db69c
[formerly 44807ba0d5
]
Former-commit-id: cb23960f0e
2013-01-22 14:47:37 -06:00
Dustin Johnson
7da688f138
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 3ec05a5a9c
[formerly 557de162b0
] [formerly 15c2c55ff9
[formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 756080321e
[formerly a3c99f86bb
]
Former-commit-id: 2168713505
2013-01-22 11:45:18 -06:00
Steve Harris
cae136ee16
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 340d2009f7
[formerly df9ac3685e
] [formerly 3a772f41cf
[formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]]
Former-commit-id: 3a772f41cf
Former-commit-id: 5b516ebb6f
[formerly 111d5afb3a
]
Former-commit-id: 922d0493fb
2013-01-22 09:40:50 -06:00
Dustin Johnson
6314e94764
Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
...
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa
Former-commit-id: 94a0cd5733
[formerly 0281da10cc
] [formerly 94a0cd5733
[formerly 0281da10cc
] [formerly 2eda48aa0d
[formerly dd07cad3e6b2471fc4371471918078498f05d01e]]]
Former-commit-id: 2eda48aa0d
Former-commit-id: 58b3edd7df
[formerly c7189052e8
]
Former-commit-id: 2df1cb5d53
2013-01-21 21:24:48 -06:00
Max Schenkelberg
babef87edb
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 8058260830
[formerly 5c51083f35
] [formerly 6fd6b2e42d
[formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 3d459dd57c
[formerly 2c05f3c179
]
Former-commit-id: 75135bf8f6
2013-01-21 14:58:16 -06:00
Dustin Johnson
ce68428901
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 04398e0aa4
[formerly c1f03f7d81
] [formerly 350becc94f
[formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]]
Former-commit-id: 350becc94f
Former-commit-id: 8aed30442e
[formerly aa85e0c3ca
]
Former-commit-id: 51a9a32485
2013-01-21 12:23:08 -06:00
Nate Jensen
2a66e94209
Merge "Issue #1446 add getLatCoords and getLonCoords to python data access framework" into development
...
Former-commit-id: 0edf7d7c9f
[formerly e0896d8b5d
] [formerly 0edf7d7c9f
[formerly e0896d8b5d
] [formerly ec1d35251c
[formerly 06dfa2bba6f7d061b43783e9029b164ad208b6fe]]]
Former-commit-id: ec1d35251c
Former-commit-id: 8f93ca0ed3
[formerly 2a07d5c89f
]
Former-commit-id: 927f7e853b
2013-01-21 11:55:34 -06:00
Matt Nash
28f809e4a7
Issue #1446 add getLatCoords and getLonCoords to python data access framework
...
Change-Id: I292a9b424cadf3033a861d8a0703b2f02946cd4e
Former-commit-id: 34ca95f039
[formerly af22cf8929
] [formerly 34ca95f039
[formerly af22cf8929
] [formerly b84af90fc2
[formerly 30ffd1412f3b193ce1fe2560f2ecf29027e7f619]]]
Former-commit-id: b84af90fc2
Former-commit-id: 0652c0840d
[formerly 177d02d01b
]
Former-commit-id: 2e6ba707e9
2013-01-21 11:51:18 -06:00
Nate Jensen
977cf22051
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 d725a23922
[formerly 36fc48eb53
] [formerly d45d793d36
[formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]]
Former-commit-id: d45d793d36
Former-commit-id: e0452a81c7
[formerly e969a8c438
]
Former-commit-id: 6400ecbe98
2013-01-21 11:42:37 -06:00
Dave Hladky
220296333b
Issue #1513 Updated the way level lookups are created
...
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555
Former-commit-id: d0ff35051e
[formerly 53ceda6a62
] [formerly d0ff35051e
[formerly 53ceda6a62
] [formerly cf1c674c2e
[formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]]
Former-commit-id: cf1c674c2e
Former-commit-id: 82cd0a1b58
[formerly e497d39d75
]
Former-commit-id: 037353dda2
2013-01-21 11:19:00 -06:00
Dave Hladky
4f536836cb
Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets.
...
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173
Former-commit-id: 1c39b88ba4
[formerly 786afee256
] [formerly 1c39b88ba4
[formerly 786afee256
] [formerly 5d8851b214
[formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]]
Former-commit-id: 5d8851b214
Former-commit-id: bd7e8a6968
[formerly c45822f09b
]
Former-commit-id: 409508d3e2
2013-01-21 08:29:29 -06:00
Richard Peter
006dbb78cf
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 ac3b484474
[formerly 76f9e42fd3
] [formerly 9feb73c161
[formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]]
Former-commit-id: 9feb73c161
Former-commit-id: d421b7208a
[formerly 5acc5996d3
]
Former-commit-id: 06d25c6c95
2013-01-18 15:43:16 -06:00
Ben Steffensmeier
c659ffb227
Issue #1495 add ensemble selection tab to subset dialog
...
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15
Former-commit-id: d06ef00715
[formerly f0d1c1a737
] [formerly d06ef00715
[formerly f0d1c1a737
] [formerly 14f3c3b3bf
[formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: 0ec9848c96
[formerly a28d09edbf
]
Former-commit-id: 88dd263c34
2013-01-18 15:42:08 -06:00
Richard Peter
f891a71692
Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
...
Former-commit-id: 7cc497c663
[formerly 9f9020db61
] [formerly 7cc497c663
[formerly 9f9020db61
] [formerly bf18ba9214
[formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]]
Former-commit-id: bf18ba9214
Former-commit-id: 0f208693ec
[formerly 2e5883c56e
]
Former-commit-id: 0e6209822e
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
cc33f33872
Issue #1495 enable ensemble subset requests in opendap.
...
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a
Former-commit-id: 928cb3b00f
[formerly eb821d7580
] [formerly 928cb3b00f
[formerly eb821d7580
] [formerly 94ba8511cb
[formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]
Former-commit-id: 94ba8511cb
Former-commit-id: 41a0a0e4e4
[formerly 7e3b6d12f6
]
Former-commit-id: 0232b77e85
2013-01-18 14:58:10 -06:00
Greg Armendariz
db31d16e61
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 edda76ad75
[formerly 9d06f6ed6d
] [formerly f7b046fa0d
[formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]]
Former-commit-id: f7b046fa0d
Former-commit-id: 817162c467
[formerly dda78c073a
]
Former-commit-id: 26c8921b73
2013-01-18 14:30:12 -06:00
Richard Peter
a08e7f9fae
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 b83e46a345
[formerly a1c58ab36d
] [formerly af105bfe0f
[formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]]
Former-commit-id: af105bfe0f
Former-commit-id: ee9adb9764
[formerly f5c8534098
]
Former-commit-id: 4ebbe408a8
2013-01-18 13:55:56 -06:00
Steve Harris
61a9f644d9
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 89f3120c0c
[formerly 2c9c6b7dde
] [formerly 407d73a04f
[formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]
Former-commit-id: 407d73a04f
Former-commit-id: 0ca985778e
[formerly bbb637faf3
]
Former-commit-id: 45760d8bef
2013-01-18 10:52:29 -06:00
Nate Jensen
c71320d922
Issue #1497 fix build
...
Former-commit-id: 13b5619297
[formerly 6e0f0d330e
] [formerly 13b5619297
[formerly 6e0f0d330e
] [formerly b52aa82213
[formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]
Former-commit-id: b52aa82213
Former-commit-id: cc0725f0b7
[formerly 98ec6fcc1c
]
Former-commit-id: d269e1953b
2013-01-17 18:42:38 -06:00
David Gillingham
9266b39ced
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 9e3999a427
[formerly c6e64d83a2
] [formerly d16760c73e
[formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]
Former-commit-id: d16760c73e
Former-commit-id: 09836dacca
[formerly a40383de3b
]
Former-commit-id: 74bd042c3f
2013-01-17 17:42:05 -06:00
Richard Peter
670ee08715
Merge "Issue #1501 Use registry version of subscription when sending notification responses" into 13.2.1_delivery
...
Former-commit-id: f553d99665
[formerly 08e7ce3da9
] [formerly f553d99665
[formerly 08e7ce3da9
] [formerly f2ed67c841
[formerly 05dde10fa4bab4b93f7a2f25c368a2a99acae581]]]
Former-commit-id: f2ed67c841
Former-commit-id: a41c4056af
[formerly 683fdaf376
]
Former-commit-id: 876b7d9502
2013-01-17 17:06:52 -06:00
Nate Jensen
41f4599ba8
Issue #1497 ported python fillEditArea to Java to boost speed
...
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36
Former-commit-id: 449b3735f0
[formerly 278ea6d24e
] [formerly 449b3735f0
[formerly 278ea6d24e
] [formerly 15e1731ef3
[formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]]
Former-commit-id: 15e1731ef3
Former-commit-id: 492634b6f5
[formerly f70f8d1f4f
]
Former-commit-id: ec5806fb58
2013-01-17 16:14:56 -06:00
Dustin Johnson
1e4df6722c
Issue #1501 Use registry version of subscription when sending notification responses
...
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962
Former-commit-id: 9f775d2dd7
[formerly d9064bdc98
] [formerly 9f775d2dd7
[formerly d9064bdc98
] [formerly 38036a0e8b
[formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 9681f57fac
[formerly 13a75fabad
]
Former-commit-id: 6266e3e44c
2013-01-17 14:53:36 -06:00
Dustin Johnson
e3cf0246c7
Issue #1412 Check file last modified times each time role data is requested
...
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa
Former-commit-id: b1ce19e41d
[formerly 74d5a70c30
] [formerly b1ce19e41d
[formerly 74d5a70c30
] [formerly 037dabb683
[formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]
Former-commit-id: 037dabb683
Former-commit-id: fce3f8bec9
[formerly 6468029207
]
Former-commit-id: 799cf85f82
2013-01-17 12:48:01 -06:00
Nate Jensen
7d1c6ce01c
Merge "Issue #1491 add Geometry converter and move registry spring instantiation" into development
...
Former-commit-id: 5e585f8bcd
[formerly 5b8cbca329
] [formerly 5e585f8bcd
[formerly 5b8cbca329
] [formerly 358e5f7ef9
[formerly c19effd855522fc5eafe7be02f845162a5bff2bb]]]
Former-commit-id: 358e5f7ef9
Former-commit-id: 55a2d4bab5
[formerly b591570bc6
]
Former-commit-id: 790f1d29e5
2013-01-17 09:28:16 -06:00