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

3208 commits

Author SHA1 Message Date
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
Juliya Dynina
bac2c83f58 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1 
Former-commit-id: 308e775017 [formerly d804167bb2] [formerly 308e775017 [formerly d804167bb2] [formerly 4ef3cfa9c3 [formerly ceb84b3c7de12a1c64f389a800125443920fbf41]]]
Former-commit-id: 4ef3cfa9c3
Former-commit-id: cc93e11ce8 [formerly 6282dd45cb]
Former-commit-id: 80e6ae71d0
 2014-04-30 14:53:36 -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
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
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
Juliya Dynina
18c84c47bc Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1 
Former-commit-id: 00bbbf32c1 [formerly d37490acb1] [formerly 00bbbf32c1 [formerly d37490acb1] [formerly 78bb549533 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]
Former-commit-id: 78bb549533
Former-commit-id: b28bb8e3ac [formerly d5290b8bbf]
Former-commit-id: a4073b805e
 2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
ecbad2efac ASM #511 changes to transmit_rfc_bias calls from MPE 
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: 1b5bccc451 [formerly 760ee964d6] [formerly 1b5bccc451 [formerly 760ee964d6] [formerly 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 93a6523f46 [formerly e28ec3469d]
Former-commit-id: 84640a8936
 2014-04-29 21:09:34 +00: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
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
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
brian.dyke
864e83994e Merge branch 'master_14.3.1' into asm_14.3.1 
Merge 14.3.1-2 into ASM


Former-commit-id: ffad42f2ef [formerly 8bda882ed0] [formerly ffad42f2ef [formerly 8bda882ed0] [formerly 4621d66089 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]]]
Former-commit-id: 4621d66089
Former-commit-id: c27ffd0678 [formerly 1939a06ced]
Former-commit-id: d6287274b2
 2014-04-28 13:25:41 -04: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
steve.naples
b5e6653935 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed. 
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: 58b091e37b [formerly e0b6f674f3] [formerly 58b091e37b [formerly e0b6f674f3] [formerly 760fc00028 [formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]]
Former-commit-id: 760fc00028
Former-commit-id: 399702b22b [formerly bed2334f57]
Former-commit-id: 26da8e332a
 2014-04-28 13:55:21 +00: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
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
David Friedman
eed80b716a ASM #525 - Text Workstation expiration pop-up inconsistent 
Change-Id: I3867a0050962d97125ca6612fcded2fe62b48619

Former-commit-id: 01b0960ac9 [formerly 8b595435e2] [formerly 01b0960ac9 [formerly 8b595435e2] [formerly ae90da3011 [formerly f7bfa197b1b61b69029efd8e225ba5dea22c17f2]]]
Former-commit-id: ae90da3011
Former-commit-id: 2a2cfa122a [formerly 4f54767780]
Former-commit-id: 3742b82fc1
 2014-04-25 19:32:47 +00: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
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
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
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
Roger Ferrel
5fda70501e Issue #3045 - Change to prevent race conditions while getting table labels. 
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120

Former-commit-id: e2b03eb190 [formerly 9dad4c959b] [formerly e2b03eb190 [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: ef81949dd1 [formerly d73f61c7e7]
Former-commit-id: ca30aa6b8a
 2014-04-24 14:48:15 -05:00
Slav Korolev
cd38f3636d Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs. 
Former-commit-id: 150a132320 [formerly 689930c484] [formerly 150a132320 [formerly 689930c484] [formerly f458f75ecf [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]
Former-commit-id: f458f75ecf
Former-commit-id: 27095ecca8 [formerly e78c6edb8c]
Former-commit-id: 1bf6d72572
 2014-04-24 15:40:52 -04:00
Brian Clements
9e2497714b Issue #2955 ignore duplicate session invites 
Former-commit-id: e81ee94171 [formerly f888819646] [formerly e81ee94171 [formerly f888819646] [formerly 4fa9afc9ae [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 39c2a1ac37 [formerly 75465b69ed]
Former-commit-id: 3b96c4c628
 2014-04-24 09:25:54 -05:00
Lee Venable
6c54817117 Issue #3040 - Fixed contact request and group name issues. 
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e

Former-commit-id: eed8c6cbba [formerly df05a79d63] [formerly eed8c6cbba [formerly df05a79d63] [formerly f13ac7e1b9 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 421a4e4677 [formerly 222154d094]
Former-commit-id: e81836e371
 2014-04-23 18:24:25 -05:00
Nate Jensen
e0b54d7b7a Issue #2623 remove ecf plugins from being included in cave 
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18

Former-commit-id: baa6714566 [formerly 07fec6a69c] [formerly baa6714566 [formerly 07fec6a69c] [formerly ecb6b4d0ce [formerly 98e3e2137ecb9ce14f8dfd295791a79a897867a2]]]
Former-commit-id: ecb6b4d0ce
Former-commit-id: 9bac89c776 [formerly 3671e18036]
Former-commit-id: 91b8d9b72b
 2014-04-23 17:29:00 -05:00
Richard Peter
4a7642c44e Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development 
Former-commit-id: 99036341f3 [formerly 026575b202] [formerly 99036341f3 [formerly 026575b202] [formerly e10434a727 [formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]
Former-commit-id: e10434a727
Former-commit-id: 4d2ee42fc9 [formerly b4226666be]
Former-commit-id: bf8b504942
 2014-04-23 17:25:25 -05:00
Ben Steffensmeier
fbb4703fe3 Issue #2947 Fixes for derived products with multiple records per frame. 
Former-commit-id: c6fc0fd4b1 [formerly c19d52db72] [formerly c6fc0fd4b1 [formerly c19d52db72] [formerly 01fc21b6f2 [formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: e3e78283dd [formerly 0cde4689fa]
Former-commit-id: bae8296507
 2014-04-23 17:14:02 -05:00
Ron Anderson
dd5c3bf2fd Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour. 
Fixed Wx parsing for AvnFPS

Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73

Former-commit-id: 2f68fb8f2c [formerly 221a06e467] [formerly 2f68fb8f2c [formerly 221a06e467] [formerly f3185dd206 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 00f2f374cd [formerly 3e37419dc6]
Former-commit-id: 78ef1d5c4c
 2014-04-23 17:04:16 -05:00
Nate Jensen
61eca0980f Merge "Issue #2822 shared display invitations always go to cave" into development 
Former-commit-id: 827112349a [formerly ad6e4712d6] [formerly 827112349a [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 418741ce55 [formerly a0423843b3]
Former-commit-id: 1abd65120e
 2014-04-23 15:30:44 -05:00
Nate Jensen
ba32067353 Merge "Issue #3060 safety checks for SWT widgets being disposed" into development 
Former-commit-id: 547bcafdb6 [formerly c193eac6e8] [formerly 547bcafdb6 [formerly c193eac6e8] [formerly 1067e4b09c [formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]
Former-commit-id: 1067e4b09c
Former-commit-id: a2df4a7ec5 [formerly d1c581aed6]
Former-commit-id: c1aa647d6d
 2014-04-23 14:24:33 -05:00
Brian Clements
8cdeb571f3 Issue #2822 shared display invitations always go to cave 
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients


Former-commit-id: 117eeca83a [formerly f3ee7b453a] [formerly 117eeca83a [formerly f3ee7b453a] [formerly 6969321db0 [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: 50acaac149 [formerly 5d2ec9b909]
Former-commit-id: d9a1bba4c8
 2014-04-23 14:16:42 -05:00
Lee Venable
711d471f3e Issue #3053 - updated list selection dialog to be more configurable and fixed subset action. 
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986

Former-commit-id: 41cd3242f5 [formerly 331dc3397f] [formerly 41cd3242f5 [formerly 331dc3397f] [formerly 765d2e80bc [formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]]]
Former-commit-id: 765d2e80bc
Former-commit-id: 029de4a1b1 [formerly 26e8c1ecf6]
Former-commit-id: 906340fb07
 2014-04-23 14:07:29 -05:00
Brian.Dyke
2161c569ea Merge branch 'master_14.2.1' into master_14.2.2 
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
 2014-04-23 14:05:50 -04:00
Nate Jensen
7c349e268e Issue #3060 safety checks for SWT widgets being disposed 
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2

Former-commit-id: fbecf66f79 [formerly 426f103e7b] [formerly fbecf66f79 [formerly 426f103e7b] [formerly 38d493ff1b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 2b68a49a43 [formerly 20f3f8ffa2]
Former-commit-id: ff9101c057
 2014-04-23 12:26:27 -05:00
brian.dyke
8f28d7213d Merge branch 'master_14.3.1' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java

Former-commit-id: c7d785d503 [formerly 805af72ef8] [formerly c7d785d503 [formerly 805af72ef8] [formerly 24316a7f66 [formerly 3f3c0a55218af9f27abce65c0ec3e8704485c36e]]]
Former-commit-id: 24316a7f66
Former-commit-id: ab43d20b28 [formerly acc904e4e8]
Former-commit-id: 8540e0de6f
 2014-04-22 16:50:57 -04:00
Nate Jensen
f4cefbc459 Merge "Issue #2903 added connection tests to session close methods" into development 
Former-commit-id: c88597b6c2 [formerly 9ec6169646] [formerly c88597b6c2 [formerly 9ec6169646] [formerly 4a04662972 [formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]
Former-commit-id: 4a04662972
Former-commit-id: d60701a264 [formerly e9456b4ab7]
Former-commit-id: 455f4385aa
 2014-04-22 12:53:08 -05:00
Nate Jensen
2b71b60b2e Merge "Issue #3056 made venue participant equals method case insensitive" into development 
Former-commit-id: cc1da5fb88 [formerly fe3ff669a7] [formerly cc1da5fb88 [formerly fe3ff669a7] [formerly 8df505325c [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]
Former-commit-id: 8df505325c
Former-commit-id: 484b197a56 [formerly be6818e96b]
Former-commit-id: ad96f9d128
 2014-04-22 12:50:27 -05:00
Nate Jensen
a3036cee45 Merge "Issue #3038 added initialized flag to session feed view" into development 
Former-commit-id: 963a848f90 [formerly 42d0d7681d] [formerly 963a848f90 [formerly 42d0d7681d] [formerly fc2be9521a [formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]
Former-commit-id: fc2be9521a
Former-commit-id: 7f777e6fb9 [formerly ca8eab399f]
Former-commit-id: 5f35eedfb1
 2014-04-22 12:49:02 -05:00
Brian Clements
d2b2106f4c Issue #2903 added connection tests to session close methods 
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: f9ab4f9cfe [formerly 50f3f420eb] [formerly f9ab4f9cfe [formerly 50f3f420eb] [formerly 49f86e4153 [formerly d570c81caed35576e867df15c2a8d900135fef5f]]]
Former-commit-id: 49f86e4153
Former-commit-id: 9ef018dbe8 [formerly c9453a2440]
Former-commit-id: 9ea5430774
 2014-04-22 12:36:40 -05:00
Nate Jensen
75cc9ecbfc Issue #2984 remove unnecessary dependencies 
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877

Former-commit-id: 48d4759371 [formerly d03afcdcba] [formerly 48d4759371 [formerly d03afcdcba] [formerly be21c41512 [formerly 290ec544e38e71332be2072435aff3b933c649ab]]]
Former-commit-id: be21c41512
Former-commit-id: 8eb74232df [formerly 8f893545f1]
Former-commit-id: 57e5bbfe84
 2014-04-22 12:03:44 -05:00