xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5639 commits 31 branches 40 tags 3.8 GiB
Commit graph

5639 commits

This branch
This branch
All branches
Author SHA1 Message Date
Greg Armendariz
e6ffd106a9 Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1 
Former-commit-id: 95612236c5 [formerly 4d76163f10] [formerly 95612236c5 [formerly 4d76163f10] [formerly 0354c9ad26 [formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]]
Former-commit-id: 0354c9ad26
Former-commit-id: c5760afb93 [formerly 8b477dfc39]
Former-commit-id: cbd92a321b
 2014-04-30 17:42:26 -05:00
Dave Hladky
a06db5a4e7 Issue #2992 Updated DD list of active registries 
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: e2a4bb6755 [formerly c352643c79] [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: ea791b5ca5 [formerly bf42c8d740]
Former-commit-id: 5b11e45636
 2014-04-30 17:38:28 -05:00
Brian Clements
170d78b62b Issue #3089 fixed init.d script for collaboration dataserver RPM 
Former-commit-id: e49d150332 [formerly 57f5ac701c] [formerly e49d150332 [formerly 57f5ac701c] [formerly 1273846844 [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]
Former-commit-id: 1273846844
Former-commit-id: 9fc8796247 [formerly a074b27951]
Former-commit-id: d1c9dbcc28
 2014-04-30 16:41:14 -05:00
Greg Armendariz
e9ba949734 Issue #2571 - Update maps.db snapshot and lake shapefile 
Former-commit-id: 4c245da2a2 [formerly 4981b6a438] [formerly 4c245da2a2 [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 94a55e5c31 [formerly 784235ab9f]
Former-commit-id: 2cd476cc62
 2014-04-30 15:42:42 -05:00
Nate Jensen
bf92253e0f Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1 
Former-commit-id: f6f9169aef [formerly 1eade4f434] [formerly f6f9169aef [formerly 1eade4f434] [formerly f005d2f31c [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: a6df4bd2b2 [formerly b98328113b]
Former-commit-id: 9b3282fabf
 2014-04-30 15:16:11 -05:00
Richard Peter
fe5fe5b587 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA 
Former-commit-id: 37a5292083 [formerly f80e16d0c9] [formerly 37a5292083 [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly 31d75a4b82413b015353055668defab0095ef893]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: f2d07ce35c [formerly 8ddc4eaffd]
Former-commit-id: 5d18fbe5d3
 2014-04-30 14:49:24 -05:00
Ben Steffensmeier
c92d5785c9 Issue #2946 Fix auxillary purge rules. 
Former-commit-id: bcc02476c6 [formerly 2850d80610] [formerly bcc02476c6 [formerly 2850d80610] [formerly 4c06cd6f5e [formerly a62bdff82f96e79737269686598687ecef746c01]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 076165515a [formerly e51a0dcb13]
Former-commit-id: 749e7fa56d
 2014-04-30 14:38:27 -05:00
Steve Harris
ae6eed5e0a Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core 
Former-commit-id: 31f17bbb51 [formerly b7272b3248] [formerly 31f17bbb51 [formerly b7272b3248] [formerly 1eb121595d [formerly 839a926dca01566419409138e9810f14e0e46b84]]]
Former-commit-id: 1eb121595d
Former-commit-id: a659f2bf1d [formerly 88a7777e79]
Former-commit-id: 2eed016efd
 2014-04-30 13:59:33 -05:00
Nate Jensen
eb5dd811ca Issue #2060 fix FFG processing 
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 2d19ee46e5 [formerly 8cbea21f32] [formerly 2d19ee46e5 [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 9a2c674142 [formerly a33ca4e3ac]
Former-commit-id: 58618a1842
 2014-04-30 13:08:26 -05:00
Richard Peter
55708f1d55 Issue #2854: Reorganize deltaScripts 
Former-commit-id: 09f41a6b31 [formerly 56745c942e] [formerly 09f41a6b31 [formerly 56745c942e] [formerly c8e373c098 [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]
Former-commit-id: c8e373c098
Former-commit-id: a526600e3e [formerly e1721cad00]
Former-commit-id: 18b4d133c7
 2014-04-30 13:03:44 -05:00
Brian.Dyke
f16c305ae4 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: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
 2014-04-30 12:57:09 -04:00
Steve Harris
d214c3174d 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: 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 6ad5b5a9d7 [formerly f168d3dddb]
Former-commit-id: 98b93e364e
 2014-04-30 11:22:22 -05:00
Mike Duff
ac6147c463 Issue #2860 - Fix to not create empty substitution tags 
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 90895cf316 [formerly 60bfadd865] [formerly 90895cf316 [formerly 60bfadd865] [formerly c0b2a19a2f [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: 1e84cb07c2 [formerly 0601068b03]
Former-commit-id: 927e8ffcbb
 2014-04-30 10:17:56 -05:00
Richard Peter
6668196c3d Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1 
Former-commit-id: 74b2cdfe34 [formerly 4ae87dcece] [formerly 74b2cdfe34 [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: f381290ed1 [formerly 9663a83d1f]
Former-commit-id: 1488bb27f8
 2014-04-29 16:14:52 -05:00
Steve Harris
8860d8e6e7 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: 7e24fd79a1 [formerly 396daac383] [formerly 7e24fd79a1 [formerly 396daac383] [formerly af7fb01f53 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]
Former-commit-id: af7fb01f53
Former-commit-id: 9b65077ad9 [formerly 225da706b7]
Former-commit-id: 04f12dbaca
 2014-04-29 16:09:07 -05:00
Ben Steffensmeier
b2c93dda87 Issue #3081 Use alias in derived paraemters less. 
Former-commit-id: fe5d69c896 [formerly 1d38fb2df1] [formerly fe5d69c896 [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: f31d7f826b [formerly 539a32666b]
Former-commit-id: d4d1e28775
 2014-04-29 15:43:08 -05:00
Ben Steffensmeier
af80e94349 Issue #3080 add NaN conversion to Slice.py 
Former-commit-id: eb9a0398df [formerly 156c25fb9c] [formerly eb9a0398df [formerly 156c25fb9c] [formerly 5959b17732 [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]
Former-commit-id: 5959b17732
Former-commit-id: 8a1b16d15e [formerly ca8cd9fb43]
Former-commit-id: 3be0087fb9
 2014-04-29 15:35:29 -05:00
Roger Ferrel
6751691433 Issue #3036 Added check for archive's root directories. 
Former-commit-id: 039e4b5209 [formerly 7a2775ecbc] [formerly 039e4b5209 [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]
Former-commit-id: 3259d4d44d
Former-commit-id: 39f7eb1ecc [formerly f71aee1e36]
Former-commit-id: d9015cddb4
 2014-04-29 14:15:11 -05:00
Brian Clements
3c8a573a48 Issue #2906 added close to BUFR parser 
close netcdf file to solve NFS clean issue


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


Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
 2014-04-29 12:07:21 -04:00
Richard Peter
938e39a0fc 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: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
 2014-04-28 16:27:40 -05:00
Steve Harris
567730e595 Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss 
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2

Former-commit-id: 2be0e7730f [formerly 7b56fb23a8] [formerly 2be0e7730f [formerly 7b56fb23a8] [formerly c4597ec58b [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]
Former-commit-id: c4597ec58b
Former-commit-id: 9ef44d2a4c [formerly 7c44a9506c]
Former-commit-id: 983efa8dd3
 2014-04-28 16:25:21 -05:00
Lee Venable
3a133f6626 Issue #3053 - added check for selected items. 
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: a8ab7f3946 [formerly 573465f316] [formerly a8ab7f3946 [formerly 573465f316] [formerly e054a7ab98 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]
Former-commit-id: e054a7ab98
Former-commit-id: eda26e6076 [formerly 43fdbe9ab6]
Former-commit-id: ede8740acc
 2014-04-28 15:24:26 -05:00
Steve Harris
51712fe90b Omaha #3085 - moved common.derivparam.python, common.inventory, common.wxmath to core 
Former-commit-id: 99a987c980 [formerly de5a81fa6e] [formerly 99a987c980 [formerly de5a81fa6e] [formerly a3618cb714 [formerly 786f3c846b23ff201d32f552ed240f1e97acace4]]]
Former-commit-id: a3618cb714
Former-commit-id: 36572c3681 [formerly 0d33195f0c]
Former-commit-id: c7ac81b0cc
 2014-04-28 14:41:41 -05:00
Ben Steffensmeier
c59046cda1 Issue #2947 ensure consistent interpolation levels for derived satellite. 
Former-commit-id: 41b0c1a3c8 [formerly 812eebdd72] [formerly 41b0c1a3c8 [formerly 812eebdd72] [formerly f318c9eb62 [formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]
Former-commit-id: f318c9eb62
Former-commit-id: bb562c9755 [formerly 868945fb1b]
Former-commit-id: 40e3df3ba1
 2014-04-28 13:00:39 -05:00
Dave Hladky
47d7ed5017 Issue #2940 Better error message for bad XMRG config in FFMP 
Former-commit-id: dc3b99cbf4 [formerly 2f4c0cd364] [formerly dc3b99cbf4 [formerly 2f4c0cd364] [formerly 82be445e97 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]
Former-commit-id: 82be445e97
Former-commit-id: 0ea0313cb8 [formerly 3df985a26a]
Former-commit-id: a6743a220a
 2014-04-28 11:04:35 -05:00
Steve Harris
dd3da741ef Omaha #3085 - Removed ufcore and ufcore-foss plugins 
Former-commit-id: 03e7d5d06f [formerly a89621797d] [formerly 03e7d5d06f [formerly a89621797d] [formerly 491b768204 [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]]
Former-commit-id: 491b768204
Former-commit-id: 558686f2fd [formerly 23e542e36b]
Former-commit-id: b19a9c9aa8
 2014-04-28 09:59:23 -05:00
Nate Jensen
d2bfcfa53b Merge "Issue #2972 fix thin client startup" into development 
Former-commit-id: d145961f4c [formerly 48cab0ae71] [formerly d145961f4c [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 74e77d307a [formerly 11a3ae5054]
Former-commit-id: 195db736e8
 2014-04-25 15:05:07 -05:00
Richard Peter
4ac0d62d7c Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development 
Former-commit-id: 5a0083987b [formerly 98b35d30c0] [formerly 5a0083987b [formerly 98b35d30c0] [formerly b06172a798 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]
Former-commit-id: b06172a798
Former-commit-id: c7882721b2 [formerly f5f6ff0008]
Former-commit-id: bac20bb9dd
 2014-04-25 14:57:51 -05:00
Nate Jensen
8f87fdc431 Merge "Issue #2629: Update capture to grab Xorg log files." into development 
Former-commit-id: d425f134ae [formerly 4842f08165] [formerly d425f134ae [formerly 4842f08165] [formerly 9a46583271 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]
Former-commit-id: 9a46583271
Former-commit-id: 1d6014f363 [formerly acfc3c2b20]
Former-commit-id: ac0b4dc1f2
 2014-04-25 14:57:47 -05:00
Richard Peter
6775b0dce6 Issue #2726: Make SmartInit shutdown more gracefully 
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 1781500740 [formerly 36742a30f3] [formerly 1781500740 [formerly 36742a30f3] [formerly 6918dc0026 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]
Former-commit-id: 6918dc0026
Former-commit-id: 433d5a77f6 [formerly 52e821b5bb]
Former-commit-id: 5a49b7e345
 2014-04-25 14:53:22 -05:00
Nate Jensen
3c4a864333 Issue #3000 fix common.dataplugin.bufrmos manifest 
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

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

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

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

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

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

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

Former-commit-id: c14497b1b7 [formerly 2426e463f7] [formerly c14497b1b7 [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 48bc49fd4b [formerly 2e8b8c6e86]
Former-commit-id: c0fd32360d
 2014-04-25 10:56:43 -05:00
Brian.Dyke
f31d8cc8cf 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: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
 2014-04-25 11:06:11 -04:00
Richard Peter
15e9fe0da3 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development 
Former-commit-id: 5b3ffb51b0 [formerly 0b765efce0] [formerly 5b3ffb51b0 [formerly 0b765efce0] [formerly 225d95171c [formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]
Former-commit-id: 225d95171c
Former-commit-id: 7371d8ccdd [formerly 02d1cf94b0]
Former-commit-id: e628067527
 2014-04-24 19:15:56 -05:00
Richard Peter
dcd2468bee Issue #2726: Add hooks to stop archiving processes during shutdown. 
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 5b14b22ee1 [formerly 37342cba87] [formerly 5b14b22ee1 [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: 2d1262e41f [formerly caccf6ca52]
Former-commit-id: b234142252
 2014-04-24 19:11:50 -05:00
Nate Jensen
ac94c81cd9 Merge "Issue #2060 remove dependency on grid dataURI column from more of DAT" into development 
Former-commit-id: 2a86a2652d [formerly 9ea03a1b3b] [formerly 2a86a2652d [formerly 9ea03a1b3b] [formerly 9cea7f88fb [formerly c73204189b318fd3aed128535166f72c99739dba]]]
Former-commit-id: 9cea7f88fb
Former-commit-id: 0cc6a6224d [formerly c86c100079]
Former-commit-id: 79fec75989
 2014-04-24 18:20:27 -05:00
Lee Venable
9bbc3844f9 Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development 
Former-commit-id: 15c9311c97 [formerly a511f8d4e7] [formerly 15c9311c97 [formerly a511f8d4e7] [formerly e7acb04432 [formerly 9762326cea40526042cd7f371d864a96abd63842]]]
Former-commit-id: e7acb04432
Former-commit-id: ae333a34dc [formerly 20d563cd15]
Former-commit-id: 40e1bbc5f1
 2014-04-24 17:53:05 -05:00
Lee Venable
70465fb1bd Merge "Issue #3045 Change column label to "Data Set"." into development 
Former-commit-id: fd7a86e187 [formerly e45c999d47] [formerly fd7a86e187 [formerly e45c999d47] [formerly 9642dac1f1 [formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]
Former-commit-id: 9642dac1f1
Former-commit-id: 059a2f59b5 [formerly e776e8c3d0]
Former-commit-id: 890891c1b5
 2014-04-24 17:42:12 -05:00
Roger Ferrel
0ece281810 Issue #3045 Change column label to "Data Set". 
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13

Former-commit-id: 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 555c8cf617 [formerly 0490023b2c]
Former-commit-id: 3d744452af
 2014-04-24 16:25:01 -05:00
Brian Clements
670c4e1611 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: 334ad3ca81 [formerly 02f08d75c6] [formerly 334ad3ca81 [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 84f75ca30a [formerly 12304655e8]
Former-commit-id: c27f2d9e53
 2014-04-24 16:10:27 -05:00