Commit graph

5736 commits

Author SHA1 Message Date
Greg Armendariz
12b9229488 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: b069ee1ea3 [formerly 94a55e5c31] [formerly 9e10990e64fcefc2ae835d7e6bae34e0905df35d [formerly 784235ab9f]]
Former-commit-id: ba6055d54db48a1a72242f8bdaf2f1b74a5a8483 [formerly 2cd476cc62]
Former-commit-id: e9ba949734
2014-04-30 15:42:42 -05:00
Nate Jensen
c3ff2e1ad4 Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly f005d2f31c [formerly 1eade4f434 [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]]
Former-commit-id: f005d2f31c
Former-commit-id: 299cb28462 [formerly a6df4bd2b2] [formerly 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b]]
Former-commit-id: 9716e295e2aaeb50ef7f01c9a4b5eed9b69ac807 [formerly 9b3282fabf]
Former-commit-id: bf92253e0f
2014-04-30 15:16:11 -05:00
Richard Peter
7dbdba81ac Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly f80e16d0c9 [formerly 31d75a4b82413b015353055668defab0095ef893]]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: 307a149bea [formerly f2d07ce35c] [formerly e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd]]
Former-commit-id: e544947f2f7406e11c3bbafca5f51212bcd4decb [formerly 5d18fbe5d3]
Former-commit-id: fe5fe5b587
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
3a60f93af0 Issue #2946 Fix auxillary purge rules.
Former-commit-id: 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 4c06cd6f5e [formerly 2850d80610 [formerly a62bdff82f96e79737269686598687ecef746c01]]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 410b30ef15 [formerly 076165515a] [formerly a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13]]
Former-commit-id: ab8dc894e2ec9095c6047bed69f4981b7f63857d [formerly 749e7fa56d]
Former-commit-id: c92d5785c9
2014-04-30 14:38:27 -05:00
Steve Harris
eec112e4b2 Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core
Former-commit-id: 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 1eb121595d [formerly b7272b3248 [formerly 839a926dca01566419409138e9810f14e0e46b84]]]]
Former-commit-id: 1eb121595d
Former-commit-id: 2f14898fec [formerly a659f2bf1d] [formerly c0924bd1b1572c832d85f3f1e15e466728edca26 [formerly 88a7777e79]]
Former-commit-id: 9705b5637307e58b21d30c400b1ff41195e1224f [formerly 2eed016efd]
Former-commit-id: ae6eed5e0a
2014-04-30 13:59:33 -05:00
Nate Jensen
a11f0d304c Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94 [formerly 9a2c674142] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842]
Former-commit-id: eb5dd811ca
2014-04-30 13:08:26 -05:00
Richard Peter
753ede7463 Issue #2854: Reorganize deltaScripts
Former-commit-id: 46a94c88cd [formerly 09f41a6b31] [formerly 56745c942e] [formerly 46a94c88cd [formerly 09f41a6b31] [formerly 56745c942e] [formerly c8e373c098 [formerly 56745c942e [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]]
Former-commit-id: c8e373c098
Former-commit-id: d25ceb8da7 [formerly a526600e3e] [formerly d5d0bc708d2a84d887a8b1401a4d596af0a188e3 [formerly e1721cad00]]
Former-commit-id: e5bdfc9c23d1ad9869b9fa62e5f577d39c450737 [formerly 18b4d133c7]
Former-commit-id: 55708f1d55
2014-04-30 13:03:44 -05:00
Brian.Dyke
f4856aae4d Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	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/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
2014-04-30 12:57:09 -04:00
Steve Harris
64492a05dc Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
	edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
	edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.auth/build.properties
	edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
	edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
	edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
	edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java


Former-commit-id: 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 5a3c6a11c2 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 103318357b [formerly 6ad5b5a9d7] [formerly ba5d0a9ff7373ccedcbbb73791d2d7a098c2ff8e [formerly f168d3dddb]]
Former-commit-id: 8ccde1991c055590b9341bfb6729666eea087e32 [formerly 98b93e364e]
Former-commit-id: d214c3174d
2014-04-30 11:22:22 -05:00
Mike Duff
458bcee21e Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly c0b2a19a2f [formerly 60bfadd865 [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: e5572a5cd0 [formerly 1e84cb07c2] [formerly b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d [formerly 0601068b03]]
Former-commit-id: 51a58accf1071311a755ab513c7f0bd32f4500c0 [formerly 927e8ffcbb]
Former-commit-id: ac6147c463
2014-04-30 10:17:56 -05:00
Richard Peter
ae3f94e875 Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 4ae87dcece [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 3c2ff2733b [formerly f381290ed1] [formerly 87db6e727009d9903d97b834ac5727197c5c6117 [formerly 9663a83d1f]]
Former-commit-id: 113b0b8e619130b9ec6b0fe3a7c274afee04d1dd [formerly 1488bb27f8]
Former-commit-id: 6668196c3d
2014-04-29 16:14:52 -05:00
Steve Harris
66ee7213aa Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java


Former-commit-id: 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly af7fb01f53 [formerly 396daac383 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]]
Former-commit-id: af7fb01f53
Former-commit-id: bb335fd675 [formerly 9b65077ad9] [formerly aeb0a11344f6daaf21e2b40c8bb422f483add825 [formerly 225da706b7]]
Former-commit-id: 0e3911d76550ba99a7aa266f7b2ddff9d81644f3 [formerly 04f12dbaca]
Former-commit-id: 8860d8e6e7
2014-04-29 16:09:07 -05:00
Ben Steffensmeier
fda1c02fb1 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly 1d38fb2df1 [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 57f185dd72 [formerly f31d7f826b] [formerly 597f015753893b012533c8d051366fb27a6f6d18 [formerly 539a32666b]]
Former-commit-id: da9381bf6b755d77e05b1e421abebbb397ec6947 [formerly d4d1e28775]
Former-commit-id: b2c93dda87
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
9197afe1d2 Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 5959b17732 [formerly 156c25fb9c [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]]
Former-commit-id: 5959b17732
Former-commit-id: 08442c513a [formerly 8a1b16d15e] [formerly b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43]]
Former-commit-id: 3115849b6ade83f809adceb6ed06ab2f79e71325 [formerly 3be0087fb9]
Former-commit-id: af80e94349
2014-04-29 15:35:29 -05:00
Roger Ferrel
be6b9a2db6 Issue #3036 Added check for archive's root directories.
Former-commit-id: fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly 7a2775ecbc [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]]
Former-commit-id: 3259d4d44d
Former-commit-id: a447baa5a0 [formerly 39f7eb1ecc] [formerly c60f0141107a305c80631ce1cee234f0b2f3d1d4 [formerly f71aee1e36]]
Former-commit-id: 5be90d0016ef7703bbda9ec332f33b977a87956f [formerly d9015cddb4]
Former-commit-id: 6751691433
2014-04-29 14:15:11 -05:00
Brian Clements
f23d3ea0b9 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly a1e416da97 [formerly 5beb3be2e8 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]]
Former-commit-id: a1e416da97
Former-commit-id: ad5be1cf6a [formerly 9f1856a6f0] [formerly 1db57f8f23775052064fa72045bb94286cb51a8a [formerly a2c0ba7f0b]]
Former-commit-id: 5477acd025c32c871813f6cc7da0b7a66884ce37 [formerly f03c6cdcf9]
Former-commit-id: 3c8a573a48
2014-04-29 13:48:00 -05:00
Brian.Dyke
2e187af9e4 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
2014-04-29 12:07:21 -04:00
Richard Peter
e748b7c1e5 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
Steve Harris
a0d412c9d1 Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2

Former-commit-id: 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly c4597ec58b [formerly 7b56fb23a8 [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]]
Former-commit-id: c4597ec58b
Former-commit-id: 1266b9438f [formerly 9ef44d2a4c] [formerly 21bcb7ea12e3aa6614573b6302c5937f0be904d4 [formerly 7c44a9506c]]
Former-commit-id: 5539a63dbf2d0f395168e771e37c63ed6f8c5480 [formerly 983efa8dd3]
Former-commit-id: 567730e595
2014-04-28 16:25:21 -05:00
Lee Venable
b011f13fb1 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly 761101dd50 [formerly a8ab7f3946] [formerly 573465f316] [formerly e054a7ab98 [formerly 573465f316 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]]
Former-commit-id: e054a7ab98
Former-commit-id: 090ea0fa5a [formerly eda26e6076] [formerly d8e463c70dce54bf7b40b1d218bccb587c3b88e6 [formerly 43fdbe9ab6]]
Former-commit-id: a4e6f79e43287a75219721e1af377b8859a3b82e [formerly ede8740acc]
Former-commit-id: 3a133f6626
2014-04-28 15:24:26 -05:00
Steve Harris
aef4dafa7d Omaha #3085 - moved common.derivparam.python, common.inventory, common.wxmath to core
Former-commit-id: 0f0f8a5ee2 [formerly 99a987c980] [formerly de5a81fa6e] [formerly 0f0f8a5ee2 [formerly 99a987c980] [formerly de5a81fa6e] [formerly a3618cb714 [formerly de5a81fa6e [formerly 786f3c846b23ff201d32f552ed240f1e97acace4]]]]
Former-commit-id: a3618cb714
Former-commit-id: 98d024336d [formerly 36572c3681] [formerly b0eec809b52563ccffa698ac75278b9e18b2151c [formerly 0d33195f0c]]
Former-commit-id: 5d4a11f22001b08539b4a01b104178f6b5f6ffe0 [formerly c7ac81b0cc]
Former-commit-id: 51712fe90b
2014-04-28 14:41:41 -05:00
Ben Steffensmeier
9980eb1eb1 Issue #2947 ensure consistent interpolation levels for derived satellite.
Former-commit-id: f4744737e4 [formerly 41b0c1a3c8] [formerly 812eebdd72] [formerly f4744737e4 [formerly 41b0c1a3c8] [formerly 812eebdd72] [formerly f318c9eb62 [formerly 812eebdd72 [formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]]
Former-commit-id: f318c9eb62
Former-commit-id: e9bc29a18e [formerly bb562c9755] [formerly 78b9fa75af2953ddce6bfad5265e177fb5696833 [formerly 868945fb1b]]
Former-commit-id: d9fda2331fa5824648a44fe1daf5e0b77e37a03d [formerly 40e3df3ba1]
Former-commit-id: c59046cda1
2014-04-28 13:00:39 -05:00
Dave Hladky
31e6954167 Issue #2940 Better error message for bad XMRG config in FFMP
Former-commit-id: a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly 82be445e97 [formerly 2f4c0cd364 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]]
Former-commit-id: 82be445e97
Former-commit-id: c4212d6252 [formerly 0ea0313cb8] [formerly 5da6cb0fddc03077fb72a39deee5bf043b26cdcb [formerly 3df985a26a]]
Former-commit-id: 16e764fba29e55076fcc6ab1f0cab2f135cb0a91 [formerly a6743a220a]
Former-commit-id: 47d7ed5017
2014-04-28 11:04:35 -05:00
Steve Harris
47be791233 Omaha #3085 - Removed ufcore and ufcore-foss plugins
Former-commit-id: 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 491b768204 [formerly a89621797d [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]]]
Former-commit-id: 491b768204
Former-commit-id: 1e989b1639 [formerly 558686f2fd] [formerly 85fa8d3f761f8d88d8e3d58caaba110e85d03595 [formerly 23e542e36b]]
Former-commit-id: 1ddc49314076d4b7f8cc758bd55e27897368ca0a [formerly b19a9c9aa8]
Former-commit-id: dd3da741ef
2014-04-28 09:59:23 -05:00
Nate Jensen
5ad4b4430f Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: 99612f1324 [formerly d145961f4c] [formerly 48cab0ae71] [formerly 99612f1324 [formerly d145961f4c] [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 48cab0ae71 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 8830b4dc71 [formerly 74e77d307a] [formerly e4462ad10f15d550cf3f5675a21220838cb4c684 [formerly 11a3ae5054]]
Former-commit-id: f5b7bcc5cc48a601ee19bd22cfeff91d7968b363 [formerly 195db736e8]
Former-commit-id: d2bfcfa53b
2014-04-25 15:05:07 -05:00
Richard Peter
67a38126d0 Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly b06172a798 [formerly 98b35d30c0 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]]
Former-commit-id: b06172a798
Former-commit-id: d45dae2155 [formerly c7882721b2] [formerly 5bda710ce91c29365a5685d0cfa858a81e171800 [formerly f5f6ff0008]]
Former-commit-id: 6f48441c6373c0ec087caa69ab0464b5070630aa [formerly bac20bb9dd]
Former-commit-id: 4ac0d62d7c
2014-04-25 14:57:51 -05:00
Nate Jensen
2f39b6eb88 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 9a46583271 [formerly 4842f08165 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]]
Former-commit-id: 9a46583271
Former-commit-id: a847ecddfa [formerly 1d6014f363] [formerly 40b297f2098fb561c5a1c6c26494e2f2273f285a [formerly acfc3c2b20]]
Former-commit-id: 94e69def4d9c026f69b3aa3df39355f486b5e5fe [formerly ac0b4dc1f2]
Former-commit-id: 8f87fdc431
2014-04-25 14:57:47 -05:00
Richard Peter
cfd219f2bb Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 6918dc0026 [formerly 36742a30f3 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]]
Former-commit-id: 6918dc0026
Former-commit-id: 4e1a30b4d9 [formerly 433d5a77f6] [formerly e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a [formerly 52e821b5bb]]
Former-commit-id: 983a1eeebf0004a7badd7ac01293b0008554a0e2 [formerly 5a49b7e345]
Former-commit-id: 6775b0dce6
2014-04-25 14:53:22 -05:00
Nate Jensen
145651f252 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: bf46b40f6e [formerly 3719815807] [formerly deda54488f] [formerly bf46b40f6e [formerly 3719815807] [formerly deda54488f] [formerly ca2cc7f11d [formerly deda54488f [formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]]]]
Former-commit-id: ca2cc7f11d
Former-commit-id: d4f4a1ab8c [formerly 4b24593f10] [formerly 81071d64de116e6f7c310d72f0fca7fcacb07ab3 [formerly 619af04a23]]
Former-commit-id: a098e1487df3ed0941d2d84f3c92b8b7e6d71017 [formerly 83864b0ff0]
Former-commit-id: 3c4a864333
2014-04-25 14:51:45 -05:00
Richard Peter
2652a4d9b0 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: fd0662eb07 [formerly 5fb2aef966] [formerly de249decab] [formerly fd0662eb07 [formerly 5fb2aef966] [formerly de249decab] [formerly 1cc7977b99 [formerly de249decab [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]]
Former-commit-id: 1cc7977b99
Former-commit-id: 76d5fc88e4 [formerly 3f66895529] [formerly 8adb3a0a5795e22045a287892d0335d8c624a4fe [formerly 7e3d3f3093]]
Former-commit-id: d3cf402b2688a4b9616bd36891bac6b11c859e41 [formerly 92c2f7fa50]
Former-commit-id: 3cbb7cb196
2014-04-25 14:42:53 -05:00
Nate Jensen
c720e2aae7 Issue #2972 fix thin client startup
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4

Former-commit-id: f007819a3b [formerly 7811040f3e] [formerly d47a09530a] [formerly f007819a3b [formerly 7811040f3e] [formerly d47a09530a] [formerly 86e9502341 [formerly d47a09530a [formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]]
Former-commit-id: 86e9502341
Former-commit-id: c7a6389dc5 [formerly c802e6a05c] [formerly e06610b8bc72529769fa8960a6b7198bd30c2095 [formerly 27ed7e5dab]]
Former-commit-id: 8c93b8803ebf8badcca85d808ea826377574c911 [formerly ce3c2c1341]
Former-commit-id: 4b6db92b9f
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
d6eadfc34c Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 2d96d9d2df [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5b61473bd6 [formerly 080c2a48f3] [formerly 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52]]
Former-commit-id: 57669c24cddfb753d969f18626729fa9ecf6418f [formerly 86174019b5]
Former-commit-id: 1bb8ce2cbe
2014-04-25 14:38:36 -05:00
Brian Clements
52e575f833 Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 1dc13cc151 [formerly 5f746c9c56] [formerly 17ab4f6184] [formerly 1dc13cc151 [formerly 5f746c9c56] [formerly 17ab4f6184] [formerly f1213c1bda [formerly 17ab4f6184 [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]]
Former-commit-id: f1213c1bda
Former-commit-id: 922d56617f [formerly ed2d66a6fa] [formerly d5d66283e23493ee2ad0d94aaa29c13df24989de [formerly fe6af8c315]]
Former-commit-id: d581af1f7d2638e596a708f8133e8ab2cb129ea5 [formerly edaaa9a426]
Former-commit-id: eb318a9a0d
2014-04-25 13:41:17 -05:00
Nate Jensen
3d10c5693c Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: df22d06b21 [formerly 64a09dbdc6] [formerly cf6992073f] [formerly df22d06b21 [formerly 64a09dbdc6] [formerly cf6992073f] [formerly 0a245df4f1 [formerly cf6992073f [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]]
Former-commit-id: 0a245df4f1
Former-commit-id: ef52d0db9b [formerly 1e47f6f03a] [formerly d69331f521630baa62047e3b82a9cc06c1b48071 [formerly b67f0a616f]]
Former-commit-id: b5a34768ff4b06283a0daa5c53ceb0c2d5389fe0 [formerly 97d3beb64b]
Former-commit-id: e0f4544f94
2014-04-25 13:26:10 -05:00
Richard Peter
4c24417ff1 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 5c0f9b5ba5 [formerly 44701f31f2 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: 947b9d7423 [formerly baee58476f] [formerly 22e220f4dbde49d7ef5d1ef995a55d8c5ac54cff [formerly 60684de8b4]]
Former-commit-id: f265228af3414b3f057894a3a0918b094b692219 [formerly 231dbfc1b9]
Former-commit-id: 928de60c87
2014-04-25 13:07:59 -05:00
David Gillingham
66e9679408 Merge "Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE." into development
Former-commit-id: de1a1853cc [formerly 073a31bacf] [formerly 56c6622207] [formerly de1a1853cc [formerly 073a31bacf] [formerly 56c6622207] [formerly f32cf61f22 [formerly 56c6622207 [formerly e18ad8fe1c14c098e33ef98e3eaeb319bc2d1b1a]]]]
Former-commit-id: f32cf61f22
Former-commit-id: 05e5630b3c [formerly 28a1606df8] [formerly 6ce8b978732007497f5d383e245538a0bb7dee8d [formerly 78d5c99d63]]
Former-commit-id: 340fb131fce527a39fb145acc9c575468e5a3f29 [formerly cbfa1e767a]
Former-commit-id: c6543f3335
2014-04-25 12:24:52 -05:00
Nate Jensen
ab003ef82a Issue #2060 remove FFG post processor dependency on dataURI, other minor
cleanups

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

Former-commit-id: a9f16fe45f [formerly d9ad750a99] [formerly 7da49c00f5] [formerly a9f16fe45f [formerly d9ad750a99] [formerly 7da49c00f5] [formerly 74b3181107 [formerly 7da49c00f5 [formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]]]]
Former-commit-id: 74b3181107
Former-commit-id: bcece2286a [formerly f6f962691f] [formerly a8aa65177362b3434658cd408da84eccb363f5c0 [formerly d0dfb21b6e]]
Former-commit-id: 4f53f94e10d54d4786ed64e6ad969eec18789654 [formerly f4b040fe4d]
Former-commit-id: af6ed8d300
2014-04-25 12:19:23 -05:00
Brian Clements
0265a8825b Issue #3079 update to lightning name will continue if it encounters invalid xml
Former-commit-id: 9d0b557dec [formerly afdae7c2e1] [formerly 3305aee692] [formerly 9d0b557dec [formerly afdae7c2e1] [formerly 3305aee692] [formerly 98adf15cda [formerly 3305aee692 [formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]]]
Former-commit-id: 98adf15cda
Former-commit-id: 89c1082c77 [formerly 421461fbd8] [formerly ed0ac441e8aaedea6c613df0559967e9ce0fdded [formerly 5ca56d292a]]
Former-commit-id: 1bcb63c85b99321a72689eabb4c9a0dfe5c98afc [formerly 5a868353c4]
Former-commit-id: 7baf887f56
2014-04-25 11:04:00 -05:00
David Gillingham
b68680eb65 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 2426e463f7 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 8db5524b3f [formerly 48bc49fd4b] [formerly cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86]]
Former-commit-id: c46af48dc3a4136893d9194d27b43b98838b448d [formerly c0fd32360d]
Former-commit-id: 83674f8444
2014-04-25 10:56:43 -05:00
Brian.Dyke
19b4bb7dcc Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Richard Peter
59e6007512 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 1c3ef27a2e [formerly 5b3ffb51b0] [formerly 0b765efce0] [formerly 1c3ef27a2e [formerly 5b3ffb51b0] [formerly 0b765efce0] [formerly 225d95171c [formerly 0b765efce0 [formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]]
Former-commit-id: 225d95171c
Former-commit-id: 93f4506b56 [formerly 7371d8ccdd] [formerly 5b0d5aaeb3bc30824dd69cc2f33ba21d62369299 [formerly 02d1cf94b0]]
Former-commit-id: 1ec144b5e8bc17e595939fa1aeb1ad50b2f87142 [formerly e628067527]
Former-commit-id: 15e9fe0da3
2014-04-24 19:15:56 -05:00
Richard Peter
a32345d1cb Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: ee59a298eb [formerly 5b14b22ee1] [formerly 37342cba87] [formerly ee59a298eb [formerly 5b14b22ee1] [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 37342cba87 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: d8950196fa [formerly 2d1262e41f] [formerly 0442d2b0ea886a8fa3e51c518e72f6a8bad19366 [formerly caccf6ca52]]
Former-commit-id: 4bd4b3b5852acfa88c28932b1c603be585f53bb9 [formerly b234142252]
Former-commit-id: dcd2468bee
2014-04-24 19:11:50 -05:00
Nate Jensen
3fc25bfb6b Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development
Former-commit-id: 35ae8de300 [formerly 2a86a2652d] [formerly 9ea03a1b3b] [formerly 35ae8de300 [formerly 2a86a2652d] [formerly 9ea03a1b3b] [formerly 9cea7f88fb [formerly 9ea03a1b3b [formerly c73204189b318fd3aed128535166f72c99739dba]]]]
Former-commit-id: 9cea7f88fb
Former-commit-id: c716f15e1c [formerly 0cc6a6224d] [formerly 0e83070df6eb12a90963dab8b3fffa2d9093bdf7 [formerly c86c100079]]
Former-commit-id: 8c0753a7d0126260d024a5590f24e2124c79a9fe [formerly 79fec75989]
Former-commit-id: ac94c81cd9
2014-04-24 18:20:27 -05:00
Lee Venable
25612cea42 Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
Former-commit-id: 4583301be4 [formerly 15c9311c97] [formerly a511f8d4e7] [formerly 4583301be4 [formerly 15c9311c97] [formerly a511f8d4e7] [formerly e7acb04432 [formerly a511f8d4e7 [formerly 9762326cea40526042cd7f371d864a96abd63842]]]]
Former-commit-id: e7acb04432
Former-commit-id: ae2a0c44df [formerly ae333a34dc] [formerly 354ff82939ff9af3bda0b0549c79621918a220c7 [formerly 20d563cd15]]
Former-commit-id: b87ed90d9dad9a8dfa6ac58452d6f27ef01b616e [formerly 40e1bbc5f1]
Former-commit-id: 9bbc3844f9
2014-04-24 17:53:05 -05:00
Lee Venable
022d1ff834 Merge "Issue #3045 Change column label to "Data Set"." into development
Former-commit-id: e35e76282f [formerly fd7a86e187] [formerly e45c999d47] [formerly e35e76282f [formerly fd7a86e187] [formerly e45c999d47] [formerly 9642dac1f1 [formerly e45c999d47 [formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]]
Former-commit-id: 9642dac1f1
Former-commit-id: cd5d582898 [formerly 059a2f59b5] [formerly 4d167b8c2ca353a3b73426a8094c1a1a3ce6b803 [formerly e776e8c3d0]]
Former-commit-id: 78c5416a7d70a9ecc41cd9e73d3b25e14e8552d2 [formerly 890891c1b5]
Former-commit-id: 70465fb1bd
2014-04-24 17:42:12 -05:00
Roger Ferrel
541ee5a81d Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13

Former-commit-id: dd679c7978 [formerly 8eb4c91ab3] [formerly 3a2a6afaf1] [formerly dd679c7978 [formerly 8eb4c91ab3] [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly 3a2a6afaf1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: f88302b94d [formerly 555c8cf617] [formerly 675b98f9712eaa32b9b8d18b880b9cabd81a288f [formerly 0490023b2c]]
Former-commit-id: e456e77496a0301296471813c64c0022c292f98e [formerly 3d744452af]
Former-commit-id: 0ece281810
2014-04-24 16:25:01 -05:00
Brian Clements
d3813b0f96 Issue #3070 fixed contact request handling
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with


Former-commit-id: 345fe6f866 [formerly 334ad3ca81] [formerly 02f08d75c6] [formerly 345fe6f866 [formerly 334ad3ca81] [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]]
Former-commit-id: 94aa761e19
Former-commit-id: 32b8ddd64c [formerly 84f75ca30a] [formerly 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8]]
Former-commit-id: 7d1e4b70e650e3930f0ba2b7d95a341ff827b93d [formerly c27f2d9e53]
Former-commit-id: 670c4e1611
2014-04-24 16:10:27 -05:00
Richard Peter
4b7ab25bbe Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: b77f780b13 [formerly c0656c811d] [formerly b53d914640] [formerly b77f780b13 [formerly c0656c811d] [formerly b53d914640] [formerly a21a2bafe1 [formerly b53d914640 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]]]
Former-commit-id: a21a2bafe1
Former-commit-id: a0f425fe91 [formerly 608b342707] [formerly ee378d853649aba6df5e619b61b93f4fe55d590e [formerly d08c051727]]
Former-commit-id: 921179ad6d09f3e6409dbcf7400e3facd07763db [formerly d71cbdb5f9]
Former-commit-id: 547d2f5333
2014-04-24 15:43:15 -05:00
Nate Jensen
f4a16ea8fc Issue #2060 remove dependency on grid dataURI column from more of DAT
Change-Id: I9123d2508f359e65124f90dafdfdf5efeaf1241a

Former-commit-id: ce43456596 [formerly 91df50ded7] [formerly 6cbd35aa47] [formerly ce43456596 [formerly 91df50ded7] [formerly 6cbd35aa47] [formerly e1eaca8071 [formerly 6cbd35aa47 [formerly e7963b0bcea141f33a00c264b26ae264d00f3abf]]]]
Former-commit-id: e1eaca8071
Former-commit-id: 4b60e9463d [formerly 8ecae7aeb5] [formerly 72cd7c57c4ff74eb9926aa623c3eb1e5f3bd009c [formerly 4f41761508]]
Former-commit-id: b1591505eba988ca253ad07d20f924a77e86f6c8 [formerly 43d4544229]
Former-commit-id: bac6b63a2f
2014-04-24 15:04:54 -05:00
Roger Ferrel
457ae58495 Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120

Former-commit-id: dd86b04686 [formerly e2b03eb190] [formerly 9dad4c959b] [formerly dd86b04686 [formerly e2b03eb190] [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 9dad4c959b [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: b511341dc4 [formerly ef81949dd1] [formerly 54b732727c2263f33c97df4d4d5ff55d84b6f396 [formerly d73f61c7e7]]
Former-commit-id: 61c965fb5391ac0a0e33f1f1fed5bd390ebde6eb [formerly ca30aa6b8a]
Former-commit-id: 5fda70501e
2014-04-24 14:48:15 -05:00