62 commits

Author	SHA1	Message	Date
Bryan Kowal	0d9400b2ec	Issue #1750 - edexBridge will now set the QPID persistence flag ... Change-Id: I84132466da523b7ce193cdd38adef85c76828a98 Former-commit-id: d484acbca0 [formerly 3a8efd5edf] [formerly 8b4dce1c3d [formerly d466b647d0d810418a88c875f39e55d98d680aa1]] Former-commit-id: 8b4dce1c3d Former-commit-id: eba8ccc6cd	2013-03-04 17:58:04 -06:00
Max Schenkelberg	5617dfaa67	Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects ... Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719 Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]] Former-commit-id: e0ba97d547 Former-commit-id: 6b1426dd34	2013-02-27 11:50:38 -06:00
Steve Harris	4f155a183a	Merge branch 'development' into omaha_13.3.1 ... Conflicts: cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]] Former-commit-id: 2641d578e2 Former-commit-id: 33dd2589f1	2013-02-21 15:41:39 -06:00
Steve Harris	e4435815c9	13.3.1-1 baseline ... Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]] Former-commit-id: d2a654625f Former-commit-id: 46d28be4a4	2013-02-20 16:19:40 -06:00
Steve Harris	bbe92e6824	13.2.1-6 baseline ... Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]] Former-commit-id: a46e33f06e Former-commit-id: 30d38334cc	2013-02-07 16:00:39 -06:00
Steve Harris	089e0254d7	Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery ... Former-commit-id: 2e6b21b299 [formerly 3bb4d338f6] [formerly f0a495e095 [formerly a3d06df18373a0f8c69f07ef0eaf0b5c0ee76fd6]] Former-commit-id: f0a495e095 Former-commit-id: 9ac3e4eacf	2013-01-25 17:41: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
Brad Gonzales	0efff32b53	Issue #1448 added updated i386-pc-linux-gnu.tar ... Change-Id: I183703485a11cc2a1c074a692870f3fcdf308870 Former-commit-id: 86f1b0468a [formerly 98e13b532f] [formerly 5953d64009 [formerly e25a8de4563afdac9b53430f61ab81db1bcca2b2]] Former-commit-id: 5953d64009 Former-commit-id: aafb4c3d48	2013-01-25 11:37:43 -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
Steve Harris	d9be4dce21	13.2.1-2 baseline ... Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]] Former-commit-id: 328c6dccad Former-commit-id: 47cc08ac79	2013-01-23 11:18:44 -05:00
Brad Gonzales	a90db41abd	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: 1a3e279226 [formerly 31c48be1c5] [formerly 69eccc1d80 [formerly 86c094b2d301dbf6ead2d74bc64b3596cf2ef6d8]] Former-commit-id: 69eccc1d80 Former-commit-id: e1e5001736	2013-01-16 15:23:53 -06:00
Steve Harris	cd4185ef5c	13.1.2-2 baseline ... Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]] Former-commit-id: 4ba416aeb3 Former-commit-id: 941337c553	2013-01-06 14:32:24 -06:00
Bryan Kowal	8579adf932	Issue #1262: ... - We will now be building a 64-bit version of the awips2-notification rpm - Updated qpid-devel in nativeLib to match the version of qpid we are using - Added 64-bit libraries to thrift and qpid in nativeLib - The notification executables are now built from source out of nativeLib - Updated build-notification.sh for compatibility with automated builds Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396 Former-commit-id: 7fb4e993e6 [formerly 660a9b615f] [formerly f39489c44c [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]] Former-commit-id: f39489c44c Former-commit-id: c44c4bd061	2012-12-16 21:40:26 -06:00
Richard Peter	2100b136a9	Revert "Issue #1262:" ... This reverts commit bad53d1b7f [formerly 9490652103] [formerly 0970259114] [formerly c3da463f39 [formerly a210f08acc] [formerly 0970259114 [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]] Former-commit-id: 9d03a53fb5 [formerly 9a7cfa2383] [formerly f37f948456 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]] Former-commit-id: f37f948456 Former-commit-id: 48641ca26f	2012-12-16 20:37:21 -06:00
Bryan Kowal	bad53d1b7f	Issue #1262: ... - We will now be building a 64-bit version of the awips2-notification rpm - Updated qpid-devel in nativeLib to match the version of qpid we are using - Added 64-bit libraries to thrift and qpid in nativeLib - The notification executables are now built from source out of nativeLib Former-commit-id: c3da463f39 [formerly a210f08acc] [formerly 0970259114 [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]] Former-commit-id: 0970259114 Former-commit-id: 9490652103	2012-12-13 12:40:31 -06:00
Steve Harris	f02c1ef71d	Merge branch 'ss_builds' (12.12.1-12) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]] Former-commit-id: f6988eefff Former-commit-id: 6287b32e7d	2012-12-11 08:45:53 -06:00
Steve Harris	8a41d325d2	12.12.1-10 baseline ... Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]] Former-commit-id: 28018b8d9b Former-commit-id: 0c67cb78a3	2012-12-06 09:12:15 -06:00
Brad Gonzales	4b38581fba	Issue #1274 rebuild of i386-pc-linux-gnu.tar. ... Change-Id: I02c9fab170f2fa4d7e2ee2e1ab6f1644dab72df6 Former-commit-id: d5db1864ea [formerly e438467557] [formerly 5d6f97271e [formerly 6fb304e98185696f57220d2bfe93383bcf5286f3]] Former-commit-id: 5d6f97271e Former-commit-id: bde5b680e4	2012-12-04 10:47:10 -06:00
Brad Gonzales	7807eca270	Issue #1274 Added Token control for java code and scripts started by RFC Crons. ... Added tokens for app control to the Apps_Defaults configuration file. Added AppsDefaults token checks to the cron java code and scripts. Updated Executor.start() to load system properties from properties files in a conf resources properties directory and also to load site specific properties from a conf resources properties site directory. Amend: Removed tabs in MainMethod.java. Updates from peer review. Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute(). Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc Former-commit-id: 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]] Former-commit-id: 44e9238fa9 Former-commit-id: 253c19ae05	2012-10-31 21:20:40 -05:00
Steve Harris	efba080b9c	12.11.1-7 baseline ... Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]] Former-commit-id: 79a5638de9 Former-commit-id: cfd228f0d7	2012-10-23 16:40:50 -05:00
Steve Harris	2c82d9cb07	12.11.1-4 baseline ... Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]] Former-commit-id: 6958b861f0 Former-commit-id: cbbdb231ce	2012-10-16 13:27:07 -05:00
Bryan Kowal	367c8d0211	Issue #1253 - re-compiled the shared libraries with the -O2 flag ... Change-Id: I7e15eb5285f485fab4cdbf35e13dba91417090e1 Former-commit-id: 3a5a9e9a24 [formerly 27b8ed0057] [formerly 1cbc7c77a1 [formerly daa7b076a331dab3d7139a16a24a4880becd08b1]] Former-commit-id: 1cbc7c77a1 Former-commit-id: 385cd3f62a	2012-10-09 14:40:36 -05:00
Steve Harris	8edfe17e7d	Merge branch 'ss_builds' (12.10.1-8) into development ... Conflicts: cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java Former-commit-id: 686b1756c9 [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]] Former-commit-id: 3827a78a7b Former-commit-id: f5f59b6aa5	2012-09-25 10:31:57 -05:00
Steve Harris	0e77eb2fe2	12.10.1-6 baseline ... Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]] Former-commit-id: ba648f8e72 Former-commit-id: 5d5a61bd75	2012-09-25 10:14:23 -05:00
Steve Harris	e23b030dfd	Merge branch 'ss_builds' (12.10.1-4) into development ... Conflicts: cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java Former-commit-id: 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]] Former-commit-id: 04d9735c8f Former-commit-id: 53673f63e6	2012-09-13 13:26:13 -05:00
Steve Harris	684feb34e5	12.10.1-4 baseline ... Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]] Former-commit-id: 49c3861597 Former-commit-id: 2ba58a3576	2012-09-13 12:08:11 -05:00
Steve Harris	f224e3e8ad	Merge branch 'ss_builds' (12.10.1-1) into development ... Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]] Former-commit-id: af106f1d29 Former-commit-id: 53e29f59e4	2012-09-04 12:11:03 -05:00
Steve Harris	e720b8ed31	12.10.1-1 baseline ... Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]] Former-commit-id: d708932029 Former-commit-id: 7bd9c63dc7	2012-09-04 12:07:27 -05:00
Steve Harris	ffe253196a	Merge branch 'ss_builds' (12.9.1-11) into development ... Conflicts: rpms/build/i386/build.sh Former-commit-id: f52c8b374d [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]] Former-commit-id: 34cbde4124 Former-commit-id: 3230e0b246	2012-08-30 14:40:34 -05:00
Steve Harris	f43a5af47f	12.9.1-10 baseline ... Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]] Former-commit-id: cb9b80f3a0 Former-commit-id: dc08c5a71a	2012-08-30 14:28:27 -05:00
Steve Harris	dbcb28ce77	Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development ... Conflicts: cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java Former-commit-id: 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]] Former-commit-id: a71dac6cad Former-commit-id: 87a602dfee	2012-08-27 09:53:55 -05:00
Steve Harris	3e9ee884ab	Merge branch 'ss_builds' (12.9.1-5 forgotten bin files) into development_on_ss_builds ... Conflicts: edexOsgi/build.edex/esb/bin/linux-x86-64/wrapper Former-commit-id: fbe4210245 [formerly 13f70884f3] [formerly 9425f73c71 [formerly aa64613b0d04bca36310817989c79d12f0f107db]] Former-commit-id: 9425f73c71 Former-commit-id: de16453f4f	2012-08-22 16:06:02 -05:00
Steve Harris	34fa4b5804	12.9.1-5 baseline (with forgotten bin files now included) ... Former-commit-id: 7a4f4ac493 [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]] Former-commit-id: b77a4d40d7 Former-commit-id: b2c0dd1abb	2012-08-22 16:00:33 -05:00
Steve Harris	b335416e06	Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds ... Conflicts: cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java edexOsgi/build.edex/edex/allElements.xml edexOsgi/build.edex/edex/customAssembly.xml edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so edexOsgi/build.edex/esb/lib/native/linux64/libjep.so nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs nativeLib/rary.cots.jasper/jasper-1.900.1/configure rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0 rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0 rpms/awips2.edex/deploy.builder/build.sh rpms/build/i386/build.sh tools/scripts/commit-msg tools/scripts/git-u-setup tools/scripts/uamend tools/scripts/ucommit tools/scripts/upull tools/scripts/upush tools/scripts/ustat Former-commit-id: 084ac9fbd4 [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]] Former-commit-id: 44a7cb75e7 Former-commit-id: 77369f78a6	2012-08-21 16:17:58 -05:00
Steve Harris	7fb0b17bd5	12.9.1-5 baseline ... Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]] Former-commit-id: f2fac39428 Former-commit-id: 72824561cb	2012-08-21 15:27:03 -05:00
Steve Harris	a7266b63fc	Issue #989 - Adding markings to jasper ... Former-commit-id: 5ce7935576 [formerly ccc150c980] [formerly 9e8f59f31d [formerly 306b93cb3b73ae963b5900c8200d29a659689a74]] Former-commit-id: 9e8f59f31d Former-commit-id: 15462e7a38	2012-08-20 16:26:51 -05:00
Steve Harris	dbe07ca70c	Merge branch 'development' into development_on_ss_builds ... Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]] Former-commit-id: a1071e3204 Former-commit-id: 8f4ddad22c	2012-08-06 08:23:04 -05:00
Steve Harris	d2291ba23f	Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java rpms/awips2.64/Installer.h5py/component.spec rpms/awips2.64/Installer.python/component.spec rpms/awips2.64/Installer.python/src/lapack.patch1 rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template rpms/python.site-packages/Installer.pupynere/component.spec Former-commit-id: fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]] Former-commit-id: 51e38ca887 Former-commit-id: 3476fe755b	2012-08-01 12:43:12 -05:00
Bryan Kowal	5b7330ca01	Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures. ... Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6 Former-commit-id: 6126e4316a [formerly 485334331a] [formerly d07281ac51 [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]] Former-commit-id: d07281ac51 Former-commit-id: 024a23e7a3	2012-08-01 11:50:24 -05:00
Steve Harris	dab00b12e6	12.8.1-5 baseline ... Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]] Former-commit-id: cd49ef3eda Former-commit-id: e0c3722fd1	2012-08-01 10:45:37 -05:00
Steve Harris	9e4df42326	Merge branch 'master' (OB12.7.1-8) into development ... Conflicts: cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java cave/com.raytheon.uf.viz.points/.classpath cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java cave/com.raytheon.viz.feature.awips.developer/feature.xml cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java deltaScripts/.pydevproject edexOsgi/build.edex/deploy-install.xml edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java edexOsgi/com.raytheon.uf.common.climo/.classpath edexOsgi/com.raytheon.uf.common.climo/.project edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java edexOsgi/com.raytheon.uf.common.hlstopo/.classpath edexOsgi/com.raytheon.uf.common.hlstopo/.project edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs edexOsgi/com.raytheon.uf.common.hlstopo/build.properties edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml edexOsgi/com.raytheon.uf.common.tafqueue/.classpath edexOsgi/com.raytheon.uf.common.tafqueue/.project edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath edexOsgi/com.raytheon.uf.edex.tafqueue/.project edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs rpms/awips2-rpm.db rpms/awips2.core/Installer.gfe/component.spec rpms/awips2.core/Installer.ldm/component.spec rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh rpms/awips2.core/Installer.rcm/scripts/conf/start-config rpms/awips2.edex/deploy.builder/build.sh rpms/build/release/buildCoreRPMs.sh rpms/common/yum/arch.x86/comps.xml tools/devAutoDeploy/devAutoDeploy.ecl Former-commit-id: 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]] Former-commit-id: 587bb6a274 Former-commit-id: 2aa4114e4d	2012-07-27 14:44:44 -05:00
Steve Harris	f2102bfb24	12.7.1-8 baseline ... Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]] Former-commit-id: c42ae0fa39 Former-commit-id: 9f97182964	2012-07-19 16:20:40 -05:00
Bryan Kowal	541b59d060	Merge branch 'merge_development' into development ... Former-commit-id: 226818bda5 [formerly 051a51b79c] [formerly b27994c9b1 [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]] Former-commit-id: b27994c9b1 Former-commit-id: fa5eb7a16a	2012-07-10 17:03:21 -05:00
Bryan Kowal	8d64fdba2c	Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development ... Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]] Former-commit-id: f92eb59a73 Former-commit-id: 580172b47c	2012-07-10 16:57:16 -05:00
Steve Harris	45ac1d4d51	Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10 ... These files have existing camel-cased equivalents and may not be needed. Former-commit-id: 8fff0d7e53 [formerly 479ccdbed2] [formerly 9454393d13 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]] Former-commit-id: 9454393d13 Former-commit-id: 330b9c3174	2012-07-10 09:29:33 -05:00
Steve Harris	efe25edfad	12.6.1-10 baseline ... Former-commit-id: edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]] Former-commit-id: 3cd0902b49 Former-commit-id: eacd5aeb7f	2012-06-21 08:58:00 -05:00
Steve Harris	97c4db937e	12.5.1-15 baseline ... Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]] Former-commit-id: 3904c4ccf5 Former-commit-id: 676ea3192f	2012-06-08 13:39:48 -05:00
Steve Harris	4792884ab2	12.5.1-6 baseline ... Former-commit-id: df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]] Former-commit-id: fa87dc6cf1 Former-commit-id: c452cce633	2012-05-16 16:41:22 -05:00
Steve Harris	f6300cd995	12.5.1-2 baseline ... Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]] Former-commit-id: b36c69cc67 Former-commit-id: a821111fbf	2012-05-03 19:17:13 -05:00
Steve Harris	33a67cdd82	12.4.1-10 baseline ... Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]] Former-commit-id: 8485b90ff8 Former-commit-id: a28d70b5c5	2012-05-01 18:06:13 -05:00