Commit graph

38 commits

Author SHA1 Message Date
Steve Harris
2e4db7ecaf Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26 [formerly 9e4df42326] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f]
Former-commit-id: 84d0f1fbb6
2012-07-27 14:44:44 -05:00
Roger Ferrel
1b97f2ad09 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]]
Former-commit-id: 9071334fe9
Former-commit-id: 9116d93f52 [formerly c317c5d0a3] [formerly 02403b301463b98f598c97b53f769f6aa9cdf6a2 [formerly b3df932794]]
Former-commit-id: 1d76b537c3a1bcb9fb3c9d0a26d64d72d4c7a715 [formerly d6d4222e24]
Former-commit-id: b75d001a2a
2012-07-12 11:32:03 -05:00
Bryan Kowal
0e31c23ec4 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]]
Former-commit-id: 3b7c761f99
Former-commit-id: e07c3c20b5 [formerly 470511d9a3] [formerly 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]]
Former-commit-id: 281f96fab761d65add6971c8397918fee705ea1a [formerly f64ce786e2]
Former-commit-id: 7077599e8d
2012-07-11 12:44:32 -05:00
Greg Armendariz
3bc0e4a3ea Issue #868
Change-Id: I806937722052e3671510f4003445092e4a665eb5

Former-commit-id: 57113a9d9d [formerly e119a69089] [formerly 84e8babca1] [formerly 57113a9d9d [formerly e119a69089] [formerly 84e8babca1] [formerly 2fcdef36f3 [formerly 84e8babca1 [formerly 7620d51d0df21ef6fb888fe44a23b316dfc26b00]]]]
Former-commit-id: 2fcdef36f3
Former-commit-id: 21b9c6d41e [formerly 6520670080] [formerly 010f83d0aee7da6153861690e8c43ebb020293eb [formerly 481b13193d]]
Former-commit-id: 7caadc1f580b1e0e51c5e95e74608f641a91d35a [formerly 838093ef7c]
Former-commit-id: 33cc7068ea
2012-07-10 10:15:33 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Nate Jensen
9d4acfd024 Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702

Former-commit-id: 314910c88f [formerly eb2c21c15d] [formerly 315594cab4] [formerly 314910c88f [formerly eb2c21c15d] [formerly 315594cab4] [formerly 24b40c3392 [formerly 315594cab4 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]]
Former-commit-id: 24b40c3392
Former-commit-id: b98cc05c01 [formerly 11f01325e5] [formerly d2911501fc67a32eb2a016f4d84e1503e130e670 [formerly d125185d28]]
Former-commit-id: eed240cb87b23fd0b2ceb0fb620c5c47647b08b7 [formerly bd58025a99]
Former-commit-id: c39f1c2a1d
2012-06-28 17:57:17 -05:00
Bryan Kowal
57311c0029 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: ae096aef72 [formerly 3010c15a2a] [formerly ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad71]]
Former-commit-id: 07f687a4c072b6aeddb13cb0971a782861e30540 [formerly f3409d507f]
Former-commit-id: 8da12f2c0d
2012-06-27 18:38:19 -05:00
Bryan Kowal
e05b247e3b Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
2012-06-27 17:21:48 -05:00
Brad Gonzales
34af88f6f6 Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: 65e32b50e0 [formerly bfc4e1da3c] [formerly c00fb6f089] [formerly 65e32b50e0 [formerly bfc4e1da3c] [formerly c00fb6f089] [formerly c99fa8db33 [formerly c00fb6f089 [formerly 063414b3e997718b74d59cb0155dc081fe91504c]]]]
Former-commit-id: c99fa8db33
Former-commit-id: b202cefa82 [formerly 2e4c8e88a6] [formerly a69a3a9f7d4e5482252a072cd5843c979857c060 [formerly a289b1f008]]
Former-commit-id: 681a860da5021457f92691c5ef0ce36e35c6a18b [formerly c7b518803f]
Former-commit-id: c0a73511e5
2012-06-26 15:41:14 -05:00
Brad Gonzales
72ecbdf701 Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly bef2bfa7cc [formerly 3799026523 [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]]]
Former-commit-id: bef2bfa7cc
Former-commit-id: f607efce25 [formerly be195ab805] [formerly b4f9d3dbf97343266eff5cc9488bbf4ee621cb1f [formerly 23ede5fa7b]]
Former-commit-id: eb6582678c91dbf7b3c2eec91e02dbee47158e20 [formerly 7f0f751018]
Former-commit-id: faa1ca2995
2012-06-22 15:08:40 -05:00
Steve Harris
8080ea523b 12.6.1-10 baseline
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6 [formerly efe25edfad] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44]
Former-commit-id: 56f8cf00a8
2012-06-21 08:58:00 -05:00
Steve Harris
c7356570ae Revert "12.6.1-10 baseline"
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].


Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88 12.6.1-10 baseline
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
2012-06-21 08:38:48 -05:00
Bryan Kowal
fff0ad3727 Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 966c50ed06 [formerly 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]]
Former-commit-id: 966c50ed06
Former-commit-id: 7ff1e3ec1e [formerly 07b8c70b1b] [formerly 9e66bcbf05fd841edc4760a6ff074c97a234fd5c [formerly ff0c86f857]]
Former-commit-id: 9eddd502462b27d3fe6c7131e4428d9987e86831 [formerly 6d4946e753]
Former-commit-id: 89ab662ecf
2012-06-18 11:51:47 -05:00
Bryan Kowal
14f81556c3 Merge branch '11-Collaboration' into development
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
2012-06-18 11:16:28 -05:00
Bryan Kowal
3d94c3e332 Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly c0aaac4a07 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]]
Former-commit-id: c0aaac4a07
Former-commit-id: 81fa46c01a [formerly a9c2cf4fae] [formerly 1adfac8f38f065227cc081b4143843fe19b3f856 [formerly c608fc959c]]
Former-commit-id: cd07c27f5f551d77046fbda54bdadaa0fe56e393 [formerly 720a152a45]
Former-commit-id: eca1d3d525
2012-06-14 11:35:15 -05:00
Max Schenkelberg
e773643f7a Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]]
Former-commit-id: fceef3c5a1
Former-commit-id: ea948bbb82 [formerly f0d2893e97] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a]]
Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c]
Former-commit-id: 7bac48f643
2012-06-13 17:52:11 -05:00
Steve Harris
ec9204fa94 Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
2012-06-12 14:37:12 -05:00
Steve Harris
883d66bc46 12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
2012-06-11 16:23:47 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Bryan Kowal
344e7567ae Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1

Former-commit-id: 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 304ce341b8 [formerly b817484c67] [formerly 1d8ed9e871f8274a9db57fa6db67ccd77f68abfa [formerly 0211167d87]]
Former-commit-id: e6a8df53928cd8442f4e71b1f738aa3bf1de31b5 [formerly e7f2ec38b5]
Former-commit-id: e5fd40d59e
2012-05-24 16:51:35 -05:00
Steve Harris
e460104ec9 12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025 [formerly 4792884ab2] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019]
Former-commit-id: 26ed02c3dc
2012-05-16 16:41:22 -05:00
Max Schenkelberg
2d167af343 Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 82298cb03b [formerly 06ee0bbf6f] [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 985ee5a034 [formerly 2db836b296] [formerly 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01]]
Former-commit-id: ae5df9ba1774095dd47fab5b8b61888b552632fc [formerly 6cd18a09dc]
Former-commit-id: 5729c0acc5
2012-05-09 15:02:30 -05:00
Steve Harris
c76fddc7e4 Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
6715112613 12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e [formerly f6300cd995] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413]
Former-commit-id: ef49f63d8d
2012-05-03 19:17:13 -05:00
Steve Harris
7f90924706 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Bradley Gonzales
88c3278ffa Issue #440 more descriptive login failure message
Former-commit-id: 9d44aabf06 [formerly 391f8e4d58] [formerly 6fc14461ee] [formerly 9d44aabf06 [formerly 391f8e4d58] [formerly 6fc14461ee] [formerly 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 7945fe90e6 [formerly 2d7e2b456e] [formerly 098005964c92d44ded39c3c5e5194fbf5527436a [formerly c345b2614e]]
Former-commit-id: 1eddcc6965e7c22a1738f21ecef6183843d48aa4 [formerly 7a125d179c]
Former-commit-id: 60d8ddce72
2012-04-04 16:26:58 -05:00
Max Schenkelberg
fb2aac38df Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]]
Former-commit-id: 753de872e0
Former-commit-id: f3ff93f96f [formerly c7165384f1] [formerly adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae]]
Former-commit-id: fd2fce7269f96cccd09b7c752b9ea972105488bb [formerly 5ebb709ef6]
Former-commit-id: 8e521d2c29
2012-04-02 16:15:21 -05:00
James Korman
f58209af03 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 4756721ef6 [formerly ee20250305] [formerly 095ab0eeab] [formerly 4756721ef6 [formerly ee20250305] [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]]
Former-commit-id: d6003d1e71
Former-commit-id: 860d24bf25 [formerly 578594cdfd] [formerly 5d7c36a75d50d27fdad5a4fa6b944c79100578f6 [formerly b29c262362]]
Former-commit-id: 71b45e798bc6b282639b3003ec5b024a412bd27d [formerly 072c79a582]
Former-commit-id: 0d4ccaf2e6
2012-03-14 10:24:17 -05:00
Steve Harris
fab0e2ccd5 Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 46e1499e43 [formerly f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]]
Former-commit-id: 46e1499e43
Former-commit-id: 1fa3e31716 [formerly 63764220c4] [formerly 4963e367347650292e79807030506ea282547db3 [formerly 096ba6eb30]]
Former-commit-id: 72d2a2722e035133e9f491f4cc02223a9f5a00ab [formerly 1328771113]
Former-commit-id: 034270857e
2012-02-23 13:16:35 -06:00
Steve Harris
3c8ac339bb removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]]
Former-commit-id: ecb38ba165
Former-commit-id: 9397ca10a8 [formerly d83100c3df] [formerly 7430208f5d1e69b088b0ad09205b10f1007182e4 [formerly a9b900821a]]
Former-commit-id: 45ca1834b3349431a2e9329f63d92b5396d451f6 [formerly 32fa2a28c5]
Former-commit-id: 3433a1e31c
2012-02-23 12:45:50 -06:00
Steve Harris
43ff909553 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
2012-02-23 10:06:18 -06:00
Roger Ferrel
c42448a8d5 Issue #181
Changes from January ncep_cave

Former-commit-id: aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 38f1182c6e [formerly 9475b22c54] [formerly f688e047f0ccf0adc31f824c5e1224b8d1c1598b [formerly 376f6868b6]]
Former-commit-id: 16e6613039d30140d16a08ef42c054c08fe5a737 [formerly 0d2ef82d19]
Former-commit-id: 80b5a2049b
2012-01-26 09:26:07 -06:00
Bryan Kowal
819b77d5d0 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 3bc50618b7 [formerly f6b08149ad] [formerly 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882]]
Former-commit-id: 5deeaa5352ab19e9521a87ced725f98ed250df11 [formerly a5a50ccfe0]
Former-commit-id: f0cdfeb9a8
2012-01-23 13:25:11 -06:00
Bryan Kowal
5609d47b35 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 4c4fc64253 [formerly a1dbdff475] [formerly e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]]
Former-commit-id: 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a [formerly 3bcecdfe66]
Former-commit-id: 7afea63245
2012-01-20 11:37:38 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00