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

55 commits

Author SHA1 Message Date
Michael James
199a7d184c Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.1.5-osx-merge 
Conflicts:
	.gitignore
	build/deploy.edex.awips2/esb/etc/ingestGrib.sh
	build/deploy.edex.awips2/esb/etc/request.sh
	cave/build/build.sh
	cave/build/cave/customTargets.xml
	cave/build/p2-build.xml
	cave/build/static/linux/cave/caveUtil.sh
	cave/build/static/linux/cave/run.sh
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
	cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/dataprovider/rsc/DataProviderRsc.java
	cave/com.raytheon.uf.viz.collaboration.ui/localization/collaboration/config.xml
	cave/com.raytheon.uf.viz.d2d.nsharp/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
	cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
	cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/ClearAction.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2DPerspectiveManager.java
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
	cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/handler/ExportImageHandler.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java
	cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/strings/DrawStringEvent.java
	cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/bundles/satellite/GoesrLegacyProfileMap.xml
	cave/com.raytheon.uf.viz.satellite.goesr.legacyprofile/localization/menus/satellite/goesr/profile-index.xml
	cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
	cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/help/SmartInit.html
	cave/com.raytheon.viz.gfe/help/localConfig.html
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.pointdata/localization/bundles/SurfaceColorTemp.xml
	cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.product.awips/developer.product
	cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
	cave/com.raytheon.viz.redbook/localization/bundles/Redbook.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
	cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/edex/developer.properties
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.bufrua/utility/common_static/base/purge/bufruaPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP13GribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/RAP40GribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid1440721.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.10.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.11.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.3.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.7.table
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.8.table
	edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radar/radarsInUse.txt
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyIFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkyLIFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/maritimeObscuredSkySymVFR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentMaritimeSky.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.obs/utility/common_static/base/derivedParameters/definitions/transparentSkySym2.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dhr.xml
	edexOsgi/com.raytheon.uf.edex.ohd/utility/edex_static/base/distribution/dpa.xml
	edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/areaNames.xml
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/creatingEntities.xml
	edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/utility/edex_static/base/satellite/mcidas/physicalElements.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/GpdCliRequestHandler.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/gpd/gpd.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductRetriever.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ProductStorer.py
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/storeActivity.py
	installCAVE.sh
	installEDEX.sh
	javaUtilities/build.wes2bridge.utility/ant/setup.xml
	javaUtilities/build.wes2bridge.utility/build.xml
	localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.cave/deploy.builder/build.sh
	rpms/awips2.core/Installer.common-base/component.spec
	rpms/awips2.core/Installer.database/component.spec
	rpms/awips2.core/Installer.edex-environment/edex/component.spec
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/build/build.sh
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.localization/component.spec
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
	rpms/awips2.core/Installer.maps-database/component.spec
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.core/Installer.pgadmin/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.topo/component.spec
	rpms/awips2.core/Installer.version/component.spec
	rpms/awips2.core/deploy.builder/build.sh
	rpms/awips2.edex/Installer.edex-shapefiles/component.spec
	rpms/awips2.edex/Installer.edex/component.spec
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/awips2.shapefiles/Installer.edex-shapefiles/component.spec
	rpms/awips2.shapefiles/deploy.builder/build.sh
	rpms/awips2.upc/Installer.edex-upc/programs/edex
	rpms/awips2.upc/Installer.ldm/component.spec
	rpms/awips2.upc/Installer.ldm/patch/cron/awips
	rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
	rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
	rpms/build/common/lookupRPM.sh
	rpms/build/common/usage.sh
	rpms/build/i386/build.sh
	rpms/build/i386/buildEnvironment.sh
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/buildEnvironment.sh
	rpms/python.site-packages/Installer.cherrypy/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pmw/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.python-awips/component.spec
	rpms/python.site-packages/Installer.thrift/component.spec
	rpms/python.site-packages/Installer.tpg/component.spec
	rpms/python.site-packages/Installer.werkzeug/component.spec
	rpms/unidata/build.sh
	rpms/unidata/buildEnvironment.sh
	rpms/unidata/rsync.dirs
 2016-09-13 10:44:13 -06:00
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
Steve Harris
bc84d97750 Merge branch 'omaha_16.1.1' into omaha_16.2.1 
Conflicts:
	cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java


Former-commit-id: 3ba87373d75582c47288fe39e8f72aa404de0a94
 2015-09-22 15:57:39 -05:00
Nate Jensen
84cda18bf2 Omaha #4654 register DESK localization level with alertviz 
Change-Id: I4e5ab85bf7aa96f2a61744022653f96091548cc5

Former-commit-id: 8c2e63d82566bd7f508260b3315909b12c44c229
 2015-09-21 14:32:40 -05:00
Nate Jensen
417ce638cd Omaha #4822 block alertviz exit until disconnect 
wait for the receiver to disconnect before exiting application
exit status will be properly set when receiver disconnects

Change-Id: Id35ce05939801e8e953c9c6a1ebbfa7982534bad

Former-commit-id: 3b95bcc5cead124c6750240bf13dc9fa780743b0
 2015-09-17 12:19:35 -05:00
Ben Steffensmeier
75f60d0114 Omaha #4021 add version information to alertviz product. 
Former-commit-id: d7dbffdff2652e2b1cb015bf729f1cf1e9878114
 2015-07-06 10:13:51 -05:00
Nate Jensen
8742617590 Omaha #4473 apply sanity to startup ordering 
Change-Id: I6ec03a4028288186e4ad23cf3cc62b2e72b9a01f

Former-commit-id: 7f7c5887625fc19ba02aa6616bda3a7ddafeba76
 2015-06-15 14:36:49 -05:00
Nate Jensen
5cb7fed240 Omaha #4473 re-enable eclipse logging 
Change-Id: I447ea4f6a3fd6b97a7252953d67a311aeae22955

Former-commit-id: b2f231510659ab060d8a0220df7d419096059c97
 2015-06-15 07:56:00 -05:00
Nate Jensen
ef596144a0 Omaha #4473 update references to moved logback classes 
Change-Id: I68ac77c7f6f74dacac0d70a6155a93cf37a1873a

Former-commit-id: 339bea8a304cec0afad5b363709689e55fe744c5
 2015-06-09 10:41:23 -05:00
Nate Jensen
f464c4e871 Omaha #4473 send viz log messages to slf4j 
enable eclipse logging to slf4j
            start alertviz ui through osgi

Change-Id: I54ccd31d9ee0e19dfb2a8c9f63dd5c9730c8c8ca

Former-commit-id: cde25bde94cadc5125ece8d5894c644d54d486e2
 2015-06-04 19:34:10 -05:00
mjames-upc
9fa5e6e9ee Merge branch upc_14.4.1 into master_14.4.1 
Former-commit-id: 95cd21246b [formerly a2e6b5e6ed] [formerly f71c396cef] [formerly 999c47a3a6437f22b3abc1d05eff866853b93d9b [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a] [formerly f71c396cef [formerly 2288995260]]]
Former-commit-id: b90a1e3192524bea70619c5bc3af4ed100cf7e6c [formerly 7a2ac36eca3df270f4afc658f6f3530848347ee4] [formerly 93b22eeb17 [formerly cd4cb8eb1d]]
Former-commit-id: 93b22eeb17
Former-commit-id: d33cf5cbc8
 2015-04-22 15:11:19 -06:00
Nate Jensen
7c7c2e3a38 Omaha #3952 disable cairo in alertviz for safety 
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f

Former-commit-id: 640cf4816e4c0cdd0e39b374b8ed02669e8170be
 2015-01-23 12:57:24 -06:00
Nate Jensen
807702fe9a Omaha #3952 disable cairo in alertviz for safety 
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f

Former-commit-id: f811157489 [formerly 8d5b4d5eb9] [formerly dddc6c2cd4] [formerly dddc6c2cd4 [formerly 415e2d4035]] [formerly f811157489 [formerly 8d5b4d5eb9] [formerly dddc6c2cd4] [formerly dddc6c2cd4 [formerly 415e2d4035]] [formerly 7c7c2e3a38 [formerly dddc6c2cd4 [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: fdc80d9cee [formerly f620816ff6] [formerly 60227bcce2] [formerly 3ce9eb6b21d47d2c4b0606729057fc7bee8f2e46 [formerly fa9b8bec1651fe83a3d02c9e7afad132bb18e9fd] [formerly 60227bcce2 [formerly c991d85bfd]]]
Former-commit-id: ce60e6f08d2b4a94a85ca7427214d31514553902 [formerly c508c91675b2a9810f26c1958ae01de48b1b1c59] [formerly 5db9791b67 [formerly 9f82d7af10]]
Former-commit-id: 5db9791b67
Former-commit-id: 6b23bfa212
 2015-01-23 12:57:24 -06:00
mjames-upc
ba80d4303b modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development 
Former-commit-id: e104fc35e2
 2015-01-12 14:07:28 -07:00
mjames-upc
886cd5940f Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development 
Former-commit-id: 7eacf4dc1c
 2015-01-12 14:02:58 -07:00
Ben Steffensmeier
47d1ae9825 Merge "Omaha #3549 remove dead code" into omaha_14.4.1 
Former-commit-id: 58946bb4ff319ac5c4c84e63268ec1149c9cede0
 2014-12-03 17:14:42 -06:00
Ben Steffensmeier
81f2b76489 Merge "Omaha #3549 remove dead code" into omaha_14.4.1 
Former-commit-id: ef58a9806f [formerly 6e49d2119e] [formerly 8c69731c75] [formerly 8c69731c75 [formerly 65431db2c9]] [formerly ef58a9806f [formerly 6e49d2119e] [formerly 8c69731c75] [formerly 8c69731c75 [formerly 65431db2c9]] [formerly 47d1ae9825 [formerly 8c69731c75 [formerly 65431db2c9] [formerly 47d1ae9825 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]]]]]
Former-commit-id: 47d1ae9825
Former-commit-id: ff36681af3 [formerly b9235da943] [formerly 58580b09a1] [formerly 1aefbeea4db38ed376daa3799b12b1202026f6a6 [formerly b058b96cbf7fc7345a3e1b5f0729e691b765541c] [formerly 58580b09a1 [formerly e9e4caa755]]]
Former-commit-id: abeda1f72e4fad79655301d695cdeb8dc479fab6 [formerly 9a4d4eef454516832c79c9c82d7683493ddaaaf8] [formerly 10bf5b2438 [formerly f74fbb95b7]]
Former-commit-id: 10bf5b2438
Former-commit-id: 4906032e70
 2014-12-03 17:14:42 -06:00
Nate Jensen
1b4db26cd8 Omaha #3549 remove dead code 
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6

Former-commit-id: b597b4e3151d4e91b3e1db1a02135d33014850d8
 2014-12-03 16:21:10 -06:00
Nate Jensen
aaa9d0d917 Omaha #3549 remove dead code 
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6

Former-commit-id: 8b40d8f44e [formerly b43ff910d5] [formerly a651246f08] [formerly a651246f08 [formerly ac98f9730c]] [formerly 8b40d8f44e [formerly b43ff910d5] [formerly a651246f08] [formerly a651246f08 [formerly ac98f9730c]] [formerly 1b4db26cd8 [formerly a651246f08 [formerly ac98f9730c] [formerly 1b4db26cd8 [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]]]]]
Former-commit-id: 1b4db26cd8
Former-commit-id: 1b49b76a85 [formerly 90b0030cca] [formerly 11d70597df] [formerly 5567dc08d5b2eb7678ca7356c2bcfb2dcbf422e2 [formerly e15523f35ea28966ae1285da24e1f3bc9faaadd5] [formerly 11d70597df [formerly 3c3437b8cc]]]
Former-commit-id: d5ccf8c443a1d89cd312fc08a953f76eabf30161 [formerly c149c2274af827861635d678c53b2669287d46d2] [formerly 2941ebd3f3 [formerly 4b4b404d0d]]
Former-commit-id: 2941ebd3f3
Former-commit-id: f642ab38e1
 2014-12-03 16:21:10 -06:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
 2014-12-03 15:47:10 -06:00
Nate Jensen
6b7e82c8f5 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: e291bd932f [formerly effb6c68bf] [formerly 6c1391e938] [formerly 6c1391e938 [formerly ec28d2f1a0]] [formerly e291bd932f [formerly effb6c68bf] [formerly 6c1391e938] [formerly 6c1391e938 [formerly ec28d2f1a0]] [formerly 8dbe6abbe4 [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 6a3723e9ec [formerly 3202b579c1] [formerly 1c5057a13f] [formerly ad98533de0e16d2987f10853c7d9d9c26929b8a7 [formerly fe8f15a6cf651b03c628440d9b584168f73a916a] [formerly 1c5057a13f [formerly 291de3f039]]]
Former-commit-id: e04e06ff2523a32fc664bd3cf1fd177746c10dfd [formerly 62ac51e4fd5ddf96d1a40756fde9b064052645f9] [formerly 0bb18f02d0 [formerly e53063661e]]
Former-commit-id: 2a87b2577c7e0445a15a2430cd4ab102809a8789 [formerly 0bb18f02d0]
Former-commit-id: ad2a20dd43
 2014-12-03 15:47:10 -06:00
Nate Jensen
41427a57bb Omaha #3678 don't enable jmx at alertviz or cave startup 
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7

Former-commit-id: 501aa1ac560f34024ab906391dc8c22c422d8509
 2014-10-01 09:46:56 -05:00
Nate Jensen
2319a1a529 Omaha #3678 don't enable jmx at alertviz or cave startup 
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7

Former-commit-id: 6adc04234e [formerly 8c3c592190] [formerly 131f5ec9f7] [formerly 131f5ec9f7 [formerly 799ba1babf]] [formerly 6adc04234e [formerly 8c3c592190] [formerly 131f5ec9f7] [formerly 131f5ec9f7 [formerly 799ba1babf]] [formerly 41427a57bb [formerly 131f5ec9f7 [formerly 799ba1babf] [formerly 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 80109254f9 [formerly 0b0b9900fe] [formerly e6100e8e7f] [formerly e1ccc0ab74a66fc1ee17d2890972ca906b453cfc [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8] [formerly e6100e8e7f [formerly 78054658a3]]]
Former-commit-id: 0e118fcd8c50a83beb6f4ee82b24e45ce5920d28 [formerly eac63f07f79044de4bb76979473040b0e13d3b46] [formerly 18f7a6f1c0 [formerly 86271d7dc9]]
Former-commit-id: 18f7a6f1c0
Former-commit-id: 0e57a71184
 2014-10-01 09:46:56 -05:00
Nate Jensen
fdc4cc60b9 Omaha #3356 configure path manager factory before spring initialization 
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: 263452a82aef4756492fe02156525137b5ca09ff
 2014-08-26 16:45:00 -05:00
Nate Jensen
b3dd10eacf Omaha #3356 configure path manager factory before spring initialization 
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: 482d090c44 [formerly 4a48867a81] [formerly f84e89b694] [formerly f84e89b694 [formerly dbbf012a34]] [formerly 482d090c44 [formerly 4a48867a81] [formerly f84e89b694] [formerly f84e89b694 [formerly dbbf012a34]] [formerly fdc4cc60b9 [formerly f84e89b694 [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: fa8f6dd9d1 [formerly 5690db1e94] [formerly 85a17ed23f] [formerly 879e68505b5ee63c1f5ee636e6a2f4c170582957 [formerly ec90e4ec5b78799ff8c90c5659475672966cd75e] [formerly 85a17ed23f [formerly 70216d11e4]]]
Former-commit-id: 059da600279f869d078bf45414bbd27bc6b08a2f [formerly ca13b3031bbdcc900e3e1367503501855ce76f87] [formerly ac5a4234cb [formerly cf2e6693ed]]
Former-commit-id: ac5a4234cb
Former-commit-id: 5e714459ca
 2014-08-26 16:45:00 -05:00
mjames-upc
969312e200 various build updates, feature muting, NCP viz edits, icon updates 
Former-commit-id: 04b06dad08
 2014-07-16 20:12:19 -06:00
mjames-upc
b4c0da1971 first commit orphan branch from remotes/origin/ncep_14.2.1 
Former-commit-id: 27eaf7aa70
 2014-04-30 19:22:58 -06:00
Richard Peter
1c150e6e8b Merge branch 'omaha_14.2.1' (14.2.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: a47eaa9af45db41391fe46e36ec0793f70d06ad6
 2014-02-27 15:18:26 -06:00
Richard Peter
c97db8f979 Merge branch 'omaha_14.2.1' (14.2.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 414ccec00e [formerly 1d6e9816e0] [formerly 50a1b270c5] [formerly d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]]]
Former-commit-id: e37a848a29c926a114114630bab3b1b48d0a088f [formerly 1916128dada6d785b45f3c66eda571278ddb03d7] [formerly 5fab51d41b [formerly 9b3f8f9649]]
Former-commit-id: 5fab51d41b
Former-commit-id: ef2ff1d0f7
 2014-02-27 15:18:26 -06:00
Nate Jensen
fd43d9e095 Issue #2704 smarter thin client connectivity dialog and connection 
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 36d571557def95e0eb1350c4e68cbe3e225f282a
 2014-02-10 16:48:29 -06:00
Nate Jensen
c0662a0fe6 Issue #2704 smarter thin client connectivity dialog and connection 
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: e9d353b136 [formerly 24bbf4949d] [formerly c28085118f] [formerly c28085118f [formerly 75ca70fba6]] [formerly e9d353b136 [formerly 24bbf4949d] [formerly c28085118f] [formerly c28085118f [formerly 75ca70fba6]] [formerly fd43d9e095 [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 693defa040 [formerly 1dcb3a77c3] [formerly c0256ac19e] [formerly e414d7ae99d7b0b7973c924dbc575dede0b1ac56 [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486] [formerly c0256ac19e [formerly 2111989497]]]
Former-commit-id: dff40f4a0faab54f6550e22441c70ca2210f96cc [formerly 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5] [formerly 93a740106d [formerly 9e09da8bb6]]
Former-commit-id: 93a740106d
Former-commit-id: aba5c50bfe
 2014-02-10 16:48:29 -06:00
Max Schenkelberg
987d4b3a30 Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 520e22dd848cf6472232d60789e1f6938db7c776
 2013-12-09 15:14:01 -06:00
Max Schenkelberg
c52c1b1fec Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 2342017e93 [formerly 0084b5b4f1] [formerly be45102814] [formerly be45102814 [formerly 9d846aa104]] [formerly 2342017e93 [formerly 0084b5b4f1] [formerly be45102814] [formerly be45102814 [formerly 9d846aa104]] [formerly 987d4b3a30 [formerly be45102814 [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 096ae8d9de [formerly 774859fcb9] [formerly e86e477165] [formerly a4524879820ece7c9894aeafc2fd9c61a5f57e1e [formerly f76ae5c39c57683f77097753d76cab458fd9e037] [formerly e86e477165 [formerly eede01921e]]]
Former-commit-id: d35dc2a654b290ba0df0956b47f858827a7b313d [formerly db317e89829b4a77b51a6217c6048e6ba7e2f098] [formerly ede6c2fa1e [formerly 5c2da4c3e3]]
Former-commit-id: ede6c2fa1e
Former-commit-id: d6ee7afe4a
 2013-12-09 15:14:01 -06:00
Nate Jensen
db6152e524 Issue #2142 initial cutover from log4j to SLF4J and logback 
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 7725d8a6cd00b3c30856b48ef86ab081b67d400b
 2013-07-01 14:41:05 -05:00
Nate Jensen
f84f342547 Issue #2142 initial cutover from log4j to SLF4J and logback 
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 6412b49aa0 [formerly 338b0ae310] [formerly a4de603bcf] [formerly a4de603bcf [formerly 316d6c09c6]] [formerly 6412b49aa0 [formerly 338b0ae310] [formerly a4de603bcf] [formerly a4de603bcf [formerly 316d6c09c6]] [formerly db6152e524 [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]]
Former-commit-id: db6152e524
Former-commit-id: b29c4d5a33 [formerly cce5d8e8ff] [formerly 5a6b0f99cc] [formerly e89b4caac14561c5cc0d2b7ada7a717139c53067 [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167] [formerly 5a6b0f99cc [formerly 6da64f329c]]]
Former-commit-id: 5a176efa9eb51d05bedebbc495148857c02aba47 [formerly dedb130eb36dca918cdf2169d1ec2f249f45f829] [formerly 86b096bc9b [formerly efcf0c8519]]
Former-commit-id: 86b096bc9b
Former-commit-id: 4f6c84f9bb
 2013-07-01 14:41:05 -05:00
Nate Jensen
0f6d897ff3 Issue #2102 improve error handling on thrift or http errors 
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: c38fb601bf4a360ab171e4d04f242e99f91710f2
 2013-06-13 11:39:30 -05:00
Nate Jensen
8be46fe812 Issue #2102 improve error handling on thrift or http errors 
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: 6d82fe1e18 [formerly a7573825c6] [formerly f55b3cbdbe] [formerly f55b3cbdbe [formerly c2faa0e3bf]] [formerly 6d82fe1e18 [formerly a7573825c6] [formerly f55b3cbdbe] [formerly f55b3cbdbe [formerly c2faa0e3bf]] [formerly 0f6d897ff3 [formerly f55b3cbdbe [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 48d7978466 [formerly f173cc29e1] [formerly 4a39d586d2] [formerly bf25946882c45c08c631ad159ae4f6a74b62f573 [formerly 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710] [formerly 4a39d586d2 [formerly 2200c7cded]]]
Former-commit-id: 413f6b5117d15df48e985567115c6bcd30e60118 [formerly 68961429c50b354dfaec2ba5f64aea79e2210876] [formerly c5d88a6dce [formerly 853f5c7546]]
Former-commit-id: c5d88a6dce
Former-commit-id: d045893591
 2013-06-13 11:39:30 -05:00
Steve Harris
fe872355a7 13.5.1-1 baseline 
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
 2013-06-10 15:17:17 -04:00
Steve Harris
98b3f1481d 13.5.1-1 baseline 
Former-commit-id: 2f344da22c [formerly 5d99df9969] [formerly 6384018950] [formerly 6384018950 [formerly 998961612c]] [formerly 2f344da22c [formerly 5d99df9969] [formerly 6384018950] [formerly 6384018950 [formerly 998961612c]] [formerly fe872355a7 [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]]
Former-commit-id: fe872355a7
Former-commit-id: 7da64307e2 [formerly 43b7a9b410] [formerly 0aab285b8a] [formerly cb6ae479723283672da81805b842b8f452f65ad4 [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69] [formerly 0aab285b8a [formerly 30ba1d634e]]]
Former-commit-id: 846a8749d39dba5372665179e09a90710c861d92 [formerly 83a711e54bdd8cabc147e6ca5222939082f46f9c] [formerly 859965fc9d [formerly 146c5e8940]]
Former-commit-id: 859965fc9d
Former-commit-id: 97a4c59662
 2013-06-10 15:17:17 -04:00
Steve Harris
c59b52a266 13.4.1-8 baseline 
Former-commit-id: d130c847d4f9d0b491f9326c8b5140fb59174927
 2013-05-14 09:21:41 -04:00
Steve Harris
288a46d8fa 13.4.1-8 baseline 
Former-commit-id: f446f7213b [formerly 02dba50c00] [formerly 576a74fe0b] [formerly 576a74fe0b [formerly 19866e7032]] [formerly f446f7213b [formerly 02dba50c00] [formerly 576a74fe0b] [formerly 576a74fe0b [formerly 19866e7032]] [formerly c59b52a266 [formerly 576a74fe0b [formerly 19866e7032] [formerly c59b52a266 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]]]
Former-commit-id: c59b52a266
Former-commit-id: fca9074b6f [formerly fddef92bf3] [formerly 5465764527] [formerly b3b3c38ab162fbc6c8eb41a20b2409b297f26645 [formerly c60ffcebecebf9d637d3276980b24255a17f4079] [formerly 5465764527 [formerly a1c4cd2a39]]]
Former-commit-id: b972f8edf1702725c88bcbde7f9482c360d26688 [formerly 39606e2ce74e5380d44e132dd22716b3b06b5051] [formerly 5bdcf5c0a1 [formerly 395d21565f]]
Former-commit-id: 5bdcf5c0a1
Former-commit-id: 4b1a9ad438
 2013-05-14 09:21:41 -04:00
Steve Harris
4ba416aeb3 13.1.2-2 baseline 
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
 2013-01-06 14:32:24 -06:00
Steve Harris
2827d6bd6e 13.1.2-2 baseline 
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 4ba416aeb3 [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7 [formerly 82cdde8491] [formerly cd4185ef5c] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0 [formerly b6fa9b4858]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
 2013-01-06 14:32:24 -06:00
Steven Harris
feec28f274 12.11.1-1 baseline 
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
 2012-09-27 15:57:45 -05:00
Steven Harris
93236b4084 12.11.1-1 baseline 
Former-commit-id: 78133c5314 [formerly ffe3641057] [formerly 0e86bfd1d3] [formerly 0e86bfd1d3 [formerly 618aa3f316]] [formerly 78133c5314 [formerly ffe3641057] [formerly 0e86bfd1d3] [formerly 0e86bfd1d3 [formerly 618aa3f316]] [formerly feec28f274 [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]]
Former-commit-id: feec28f274
Former-commit-id: 6f0716689d [formerly 9c67bbab77] [formerly f5e63d5f93] [formerly 183e013fa0cc3647a5509f1efaa773d6706225ff [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09] [formerly f5e63d5f93 [formerly 8843ffd022]]]
Former-commit-id: 7d82076e7dce91a21df5c801d2e903299b1b1d29 [formerly d6911f5473d9aadbb4a4b9d3389106feb8c83693] [formerly 2f855322f6 [formerly a544be6d83]]
Former-commit-id: 2f855322f6
Former-commit-id: db663faca9
 2012-09-27 15:57:45 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Steve Harris
26b250dbd1 12.4.1-4 baseline 
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
 2012-04-18 15:18:16 -05:00
Roger Ferrel
b2254f8df4 Issue #27 
Changes for alertviz exit

Former-commit-id: fbc018e6786730b7b597fbe5a179dc6880186b99
 2012-01-30 16:25:53 -06:00
Roger Ferrel
9b9f867a0e Issue #27 
Changes for alertviz exit

Former-commit-id: b8c2f8d128 [formerly bd73fb18a8] [formerly f0e7a527e4] [formerly f0e7a527e4 [formerly e4718d87aa]] [formerly b8c2f8d128 [formerly bd73fb18a8] [formerly f0e7a527e4] [formerly f0e7a527e4 [formerly e4718d87aa]] [formerly b2254f8df4 [formerly f0e7a527e4 [formerly e4718d87aa] [formerly b2254f8df4 [formerly fbc018e6786730b7b597fbe5a179dc6880186b99]]]]]
Former-commit-id: b2254f8df4
Former-commit-id: cd4489110e [formerly bd3240e530] [formerly 9a59cbc9de] [formerly 017f2c0bb59e687d992edb2d261644d697d2a1fc [formerly 0b73c6cd0b03145d357ead8f21e1fc31967a23cb] [formerly 9a59cbc9de [formerly b2f5691167]]]
Former-commit-id: 8fe5f99e05846b84f9e89ecc1c50737d2acb02a1 [formerly 66329ad5abad76f6048942a06d4237f61351887a] [formerly 10cfe30d45 [formerly 3b7d7ad2ad]]
Former-commit-id: 10cfe30d45
Former-commit-id: 8583722a44
 2012-01-30 16:25:53 -06:00
Bryan Kowal
ff44a81ceb Issue #22 - merging Windows MSI installer changes into git thinclient branch. 
Former-commit-id: afbdec0abdb020d47c592a37d0d0b78633e7e609
 2012-01-23 12:36:13 -06:00