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

298 commits

Author SHA1 Message Date
Steve Harris
cd4185ef5c 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Richard Peter
9f991104dd Issue #1373: Update jvm startup to load a service list for services to start. 
Former-commit-id: af5b616282 [formerly 1c560f5013] [formerly c1765f776c [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: c1765f776c
Former-commit-id: 424cb12ef6
 2013-01-03 16:27:32 -06:00
Ben Steffensmeier
ca4e39df79 Issue #1438 move all gfe processing out of the grib plugin. 
Former-commit-id: b312bce5ad [formerly 521924904a] [formerly fe0a8b60c6 [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]
Former-commit-id: fe0a8b60c6
Former-commit-id: c6032b1950
 2012-12-19 11:26:40 -06:00
Steve Harris
15849ae72a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development 
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]
Former-commit-id: ce72ebb094
Former-commit-id: 113fdcb679
 2012-12-11 08:56:54 -06:00
Steve Harris
f02c1ef71d Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
 2012-12-11 08:45:53 -06:00
Brad Gonzales
15b3a61287 Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties. 
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d

Former-commit-id: 4e44770674 [formerly bcff2c134c] [formerly 6ab74bb6ab [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 065ddf4d4a
 2012-12-10 14:08:54 -06:00
Dave Hladky
bd878d58d0 Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler 
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d

Former-commit-id: 20bbdee95d [formerly e34b9a8862] [formerly 92e8877af4 [formerly 039fdaacc80f5158240de028541ba6688fa1d468]]
Former-commit-id: 92e8877af4
Former-commit-id: b5689bac66
 2012-12-06 16:06:14 -06:00
Steve Harris
ff4131c2ee 12.12.1-8 baseline 
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
 2012-12-06 09:02:51 -06:00
Dustin Johnson
5953c5372f Issue #1377 Break registry dependency on data delivery 
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: 6d1831b002 [formerly bba092f51e] [formerly 529238d010 [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]
Former-commit-id: 529238d010
Former-commit-id: 1b165c8e73
 2012-12-03 12:06:32 -06:00
Ben Steffensmeier
f0732b0944 Issue #1358 add database-common to ingestDat 
Former-commit-id: 1eafc87945 [formerly 5eb58b7ef3] [formerly 9b0ca8043e [formerly c23d773e8d03db2c6a4735ea4e91e933b253a058]]
Former-commit-id: 9b0ca8043e
Former-commit-id: 2fa293fc9d
 2012-11-27 16:58:18 -06:00
Richard Peter
88602c16f4 Merge "Issue #1350: Track ingestGrib and ingestDat statistics" into development 
Former-commit-id: 5c398cb93f [formerly 53426e2e90] [formerly 9a90b123e7 [formerly 08b5d690e71afd7424fc00e0d4c06b497447d93a]]
Former-commit-id: 9a90b123e7
Former-commit-id: a7d31535da
 2012-11-26 18:15:21 -06:00
Richard Peter
d1d28437ad Issue #1350: Track ingestGrib and ingestDat statistics 
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 0db7ec08a2 [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]
Former-commit-id: 4d5f2fd360
Former-commit-id: b891bb63e1
 2012-11-26 18:13:13 -06:00
Bryan Kowal
87e0c08179 Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature 
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0

Former-commit-id: 95efa5f0e0 [formerly 06241d95e0] [formerly f645f60a75 [formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]
Former-commit-id: f645f60a75
Former-commit-id: f68c9873b7
 2012-11-26 13:06:33 -06:00
Dustin Johnson
dd03bf9bd5 Issue #1322 Move router registry to edex.xml 
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: dd82a472e5 [formerly 13b1683458] [formerly a9d01486ed [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]
Former-commit-id: a9d01486ed
Former-commit-id: 1bb69653af
 2012-11-19 13:21:03 -06:00
Dustin Johnson
75feca3cd0 Issue #1322 Fix ingestGrib modes.xml to include router spring file 
Amend:
  Add correct bean name.

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: 9cfb406675 [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]
Former-commit-id: 63db1ce6f8
Former-commit-id: 56ea981db7
 2012-11-19 12:03:31 -06:00
Dustin Johnson
a448369b44 Issue #1322 Add server keyed routing 
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: d1024d091c [formerly 87148a8061] [formerly 8a6be78eb0 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 1d5714b994
 2012-11-16 14:43:45 -06:00
Ben Steffensmeier
5126024a6b Issue #189 fix modes for gridcoverage to include converter registration 
Former-commit-id: 1082b1b51d [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 2a0769d094
 2012-11-16 12:25:00 -06:00
Benjamin Phillippe
43b94988c8 Issue #1335 Fixed EHCache warnings. Changes to necessary config files 
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 44519995ee [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]
Former-commit-id: 5c31b34e12
Former-commit-id: 6b1b73429b
 2012-11-15 13:35:25 -06:00
Dustin Johnson
5d5dbe27e1 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
 2012-11-14 14:41:57 -06:00
Steve Harris
e35a321a8c 12.12.1-4 baseline 
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
 2012-11-14 14:19:20 -06:00
Dustin Johnson
5d410ff934 Issue #1322 Common baseline changes to support BandwidthManager 
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: afd9a767ea [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7c59f9ea41
Former-commit-id: c0c60c2488
 2012-11-14 12:19:10 -06:00
Brad Gonzales
cc8ed35821 Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml 
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: 782ffb92ea [formerly 4af27e092f] [formerly 1617341e2a [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 1617341e2a
Former-commit-id: c024c94050
 2012-11-14 09:39:26 -06:00
Steve Harris
21ecd53719 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
 2012-11-13 17:28:50 -06:00
Steve Harris
2e3662028f 12.12.1-3 baseline 
Former-commit-id: a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
 2012-11-13 17:27:04 -06:00
Ben Steffensmeier
109ec1e778 Merge branch 'ss_builds'(12.12.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.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/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
 2012-11-13 16:00:19 -06:00
Ben Steffensmeier
7c93db759c Issue #1108 initial implementation of mappings 
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
 2012-11-08 14:45:36 -06:00
Nate Jensen
2fe69a5871 Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development 
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: 6b205399d4
Former-commit-id: e3208d48a0
 2012-11-07 18:18:06 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Max Schenkelberg
5a5bd522a1 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
 2012-11-07 10:44:42 -06:00
Bryan Kowal
d928e2f257 Issue #1276 - v1.0 of multiple WA deployment support 
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: cae04523db [formerly 9263a0ac57] [formerly 4fd43ee45c [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]
Former-commit-id: 4fd43ee45c
Former-commit-id: 2c14ea1bb7
 2012-11-06 16:13:26 -06:00
Dustin Johnson
7b4967b5bb Issue #1302 Fixes for data delivery merge with development branch. 
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: 8d5c86f31e [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7f994472ae
 2012-11-01 16:31:14 -05:00
Dustin Johnson
e7a0f96a9a Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Brad Gonzales
4ffe05d37e Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources. 
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 449e4a2182 [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]
Former-commit-id: 20a5fe3577
Former-commit-id: 2ffcd5d684
 2012-11-01 11:02:48 -05:00
Brad Gonzales
7807eca270 Issue #1274 Added Token control for java code and scripts started by RFC Crons. 
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]
Former-commit-id: 44e9238fa9
Former-commit-id: 253c19ae05
 2012-10-31 21:20:40 -05:00
Ben Steffensmeier
1d94435220 merge branch Unifeid_Grid into developement 
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
 2012-10-30 12:24:54 -05:00
Brad Gonzales
781265a6a8 Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository: 
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: 24fc32ee14
Former-commit-id: 5949c8b09c
 2012-10-26 14:00:55 -05:00
Ben Steffensmeier
45cc834fc3 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid 
Former-commit-id: 7734a983f5 [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 54f414a7e0
 2012-10-25 16:17:54 -05:00
Ben Steffensmeier
9b8f2bcdbd merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
 2012-10-25 12:22:11 -05:00
Nate Jensen
8ee3d9b304 Merge "Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run" into development 
Former-commit-id: 409da6ad67 [formerly c70d361f2d] [formerly 73bc74d3d5 [formerly e032f584ec1caa3c9c973d554123678f828791a7]]
Former-commit-id: 73bc74d3d5
Former-commit-id: 29c8908ef7
 2012-10-24 15:27:56 -05:00
Steve Harris
28dccc0278 Merge branch 'ss_builds' (12.11.1-10) into development 
Former-commit-id: af3161539a [formerly e8e3ef530c] [formerly 1b2cb0db6c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]]
Former-commit-id: 1b2cb0db6c
Former-commit-id: 19dca3feca
 2012-10-24 15:15:14 -05:00
Steve Harris
61224dec54 12.11.1-10 baseline 
Former-commit-id: 63dddc5f5f [formerly e845c605e6] [formerly 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: 0ba69044a2
Former-commit-id: cc21977c35
 2012-10-24 15:13:57 -05:00
Ron Anderson
a0402bb612 Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run 
Change-Id: Ie9bfc66b5cba7639155944765701833ffa788660

Former-commit-id: bd5537e63d [formerly e226e41852] [formerly e0b809db9f [formerly f00655f5c5fb53af0682313e5054124a459b9649]]
Former-commit-id: e0b809db9f
Former-commit-id: 56a04517a8
 2012-10-24 14:11:30 -05:00
Steve Harris
8486da2fd3 Merge branch 'ss_builds' (12.11.1-6) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: 1807100932
Former-commit-id: 892e4df811
 2012-10-18 16:01:05 -05:00
Steve Harris
8beb6fc0b8 12.11.1-6 baseline 
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
 2012-10-18 15:53:01 -05:00
Steve Harris
85ad066b70 12.11.1-5 baseline 
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
 2012-10-18 15:46:42 -05:00
Ben Steffensmeier
db2c9b41ec Issue #189 fix unified grid problems found during install/upgrade on testbed 
Former-commit-id: f3331dc743 [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]
Former-commit-id: 90b815d412
Former-commit-id: ea2f15c0df
 2012-10-18 13:27:37 -05:00
Steve Harris
d0e91329b4 Merge branch 'ss_builds' (12.11.1-4) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
 2012-10-16 15:48:14 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Steve Harris
f0121b6fa8 Merge branch 'ss_builds' (12.11.1-3) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: 8b7665418a [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 63da835aef
 2012-10-16 09:20:37 -05:00
Steve Harris
725b2f8ba5 12.11.1-3 baseline 
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
 2012-10-15 16:30:31 -05:00