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

170 commits

Author SHA1 Message Date
Dave Hladky
64c293c460 Issue #1477 Permissions broken for ingestDAT SQL querries. 
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: 65cfb39ba5 [formerly 30733d3b25] [formerly 65cfb39ba5 [formerly 30733d3b25] [formerly c9160ac945 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]
Former-commit-id: c9160ac945
Former-commit-id: e746688671 [formerly c5f71be70a]
Former-commit-id: 936d0f143d
 2013-01-14 11:38:45 -06:00
Steve Harris
1ef10eaf2c 13.1.2-7 baseline 
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e [formerly b7f1dbe72b]
Former-commit-id: 775a338b90
 2013-01-11 16:12:09 -05:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
 2013-01-09 17:55:05 -06:00
Richard Peter
884d082f9e Issue #1454: Update registry log4j 
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

Former-commit-id: 08922e14b7 [formerly c8f79ee0cc] [formerly 08922e14b7 [formerly c8f79ee0cc] [formerly 7b4d04e828 [formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]
Former-commit-id: 7b4d04e828
Former-commit-id: 84c5aa1d29 [formerly b9ae764a04]
Former-commit-id: bf14d0167a
 2013-01-07 17:03:15 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
 2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
 2013-01-06 14:32:24 -06:00
Richard Peter
e8d1469a70 Issue #1373: Update jvm startup to load a service list for services to start. 
Former-commit-id: af5b616282 [formerly 1c560f5013] [formerly af5b616282 [formerly 1c560f5013] [formerly c1765f776c [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]
Former-commit-id: c1765f776c
Former-commit-id: 9f991104dd [formerly 424cb12ef6]
Former-commit-id: 6fd64a20fa
 2013-01-03 16:27:32 -06:00
Ben Steffensmeier
f62c7fde9b Issue #1438 move all gfe processing out of the grib plugin. 
Former-commit-id: b312bce5ad [formerly 521924904a] [formerly b312bce5ad [formerly 521924904a] [formerly fe0a8b60c6 [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: ca4e39df79 [formerly c6032b1950]
Former-commit-id: 7d19f5e38f
 2012-12-19 11:26:40 -06:00
Steve Harris
868acb808b Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development 
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 15849ae72a [formerly 113fdcb679]
Former-commit-id: db24093e42
 2012-12-11 08:56:54 -06:00
Steve Harris
b0a60923c4 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 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d [formerly 6287b32e7d]
Former-commit-id: ebcc9975c4
 2012-12-11 08:45:53 -06:00
Brad Gonzales
5959f06dbd 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 4e44770674 [formerly bcff2c134c] [formerly 6ab74bb6ab [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 15b3a61287 [formerly 065ddf4d4a]
Former-commit-id: cb35e0f5e8
 2012-12-10 14:08:54 -06:00
Dave Hladky
c8037a5575 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 20bbdee95d [formerly e34b9a8862] [formerly 92e8877af4 [formerly 039fdaacc80f5158240de028541ba6688fa1d468]]]
Former-commit-id: 92e8877af4
Former-commit-id: bd878d58d0 [formerly b5689bac66]
Former-commit-id: 1299130f80
 2012-12-06 16:06:14 -06:00
Steve Harris
0b22b3c014 12.12.1-8 baseline 
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee [formerly ee06a94735]
Former-commit-id: ec2cdc1593
 2012-12-06 09:02:51 -06:00
Dustin Johnson
5f51b0b3f8 Issue #1377 Break registry dependency on data delivery 
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: 6d1831b002 [formerly bba092f51e] [formerly 6d1831b002 [formerly bba092f51e] [formerly 529238d010 [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]
Former-commit-id: 529238d010
Former-commit-id: 5953c5372f [formerly 1b165c8e73]
Former-commit-id: 5731299558
 2012-12-03 12:06:32 -06:00
Ben Steffensmeier
81bf8f2ce1 Issue #1358 add database-common to ingestDat 
Former-commit-id: 1eafc87945 [formerly 5eb58b7ef3] [formerly 1eafc87945 [formerly 5eb58b7ef3] [formerly 9b0ca8043e [formerly c23d773e8d03db2c6a4735ea4e91e933b253a058]]]
Former-commit-id: 9b0ca8043e
Former-commit-id: f0732b0944 [formerly 2fa293fc9d]
Former-commit-id: ca2a22f236
 2012-11-27 16:58:18 -06:00
Richard Peter
688cc569f5 Issue #1350: Track ingestGrib and ingestDat statistics 
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 0db7ec08a2 [formerly 8d40a8fea9] [formerly 0db7ec08a2 [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: d1d28437ad [formerly b891bb63e1]
Former-commit-id: 17189b1862
 2012-11-26 18:13:13 -06:00
Dustin Johnson
5b64ddb7ba 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 dd82a472e5 [formerly 13b1683458] [formerly a9d01486ed [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: dd03bf9bd5 [formerly 1bb69653af]
Former-commit-id: f91817813d
 2012-11-19 13:21:03 -06:00
Dustin Johnson
80622f912d 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 9cfb406675 [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]]
Former-commit-id: 63db1ce6f8
Former-commit-id: 75feca3cd0 [formerly 56ea981db7]
Former-commit-id: 167e11671b
 2012-11-19 12:03:31 -06:00
Dustin Johnson
08f3910ece 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 d1024d091c [formerly 87148a8061] [formerly 8a6be78eb0 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: a448369b44 [formerly 1d5714b994]
Former-commit-id: 2afb19d76b
 2012-11-16 14:43:45 -06:00
Ben Steffensmeier
268f7cb64d Issue #189 fix modes for gridcoverage to include converter registration 
Former-commit-id: 1082b1b51d [formerly 1a7560b8a3] [formerly 1082b1b51d [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 5126024a6b [formerly 2a0769d094]
Former-commit-id: 13f8f28c2e
 2012-11-16 12:25:00 -06:00
Benjamin Phillippe
debdd584fd Issue #1335 Fixed EHCache warnings. Changes to necessary config files 
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 44519995ee [formerly 5bf46d468d] [formerly 44519995ee [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 43b94988c8 [formerly 6b1b73429b]
Former-commit-id: 688e19acc1
 2012-11-15 13:35:25 -06:00
Dustin Johnson
6d21c445c2 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 d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 5d5dbe27e1 [formerly e25b7c312b]
Former-commit-id: ff33643234
 2012-11-14 14:41:57 -06:00
Steve Harris
2c2bfc949d 12.12.1-4 baseline 
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: e35a321a8c [formerly 628ca9e5c6]
Former-commit-id: 493f335c0b
 2012-11-14 14:19:20 -06:00
Dustin Johnson
0c5a52f3b1 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 afd9a767ea [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 5d410ff934 [formerly c0c60c2488]
Former-commit-id: 3129d3bd3a
 2012-11-14 12:19:10 -06:00
Brad Gonzales
ec0fc6417a Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml 
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: 782ffb92ea [formerly 4af27e092f] [formerly 782ffb92ea [formerly 4af27e092f] [formerly 1617341e2a [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]
Former-commit-id: 1617341e2a
Former-commit-id: cc8ed35821 [formerly c024c94050]
Former-commit-id: dfc125236d
 2012-11-14 09:39:26 -06:00
Steve Harris
ae9d9985cd Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
 2012-11-13 17:28:50 -06:00
Steve Harris
7058ebec23 12.12.1-3 baseline 
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
 2012-11-13 17:27:04 -06:00
Ben Steffensmeier
9f2f2591ee 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 ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
 2012-11-13 16:00:19 -06:00
Ben Steffensmeier
2223e6ff64 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 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c [formerly 884c82c4fe]
Former-commit-id: 74d1381180
 2012-11-08 14:45:36 -06:00
Steve Harris
af59663a99 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
 2012-11-07 12:41:20 -06:00
Max Schenkelberg
2345861756 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 f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1 [formerly 747ab974e9]
Former-commit-id: 50625b0453
 2012-11-07 10:44:42 -06:00
Dustin Johnson
931d94d1de 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 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
 2012-11-01 13:36:06 -05:00
Brad Gonzales
78fbf32245 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 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]]
Former-commit-id: 44e9238fa9
Former-commit-id: 7807eca270 [formerly 253c19ae05]
Former-commit-id: 6fae286ad2
 2012-10-31 21:20:40 -05:00
Ben Steffensmeier
1931b503a2 merge branch Unifeid_Grid into developement 
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220 [formerly 92fd247ccc]
Former-commit-id: 38b0dafe0b
 2012-10-30 12:24:54 -05:00
Ben Steffensmeier
34e4be26d0 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid 
Former-commit-id: 7734a983f5 [formerly b7d61e7543] [formerly 7734a983f5 [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 45cc834fc3 [formerly 54f414a7e0]
Former-commit-id: d2eb23821f
 2012-10-25 16:17:54 -05:00
Ben Steffensmeier
86562637f0 merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd [formerly a77d2097f8]
Former-commit-id: dd5ab10b61
 2012-10-25 12:22:11 -05:00
Nate Jensen
d67b0e704e 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 409da6ad67 [formerly c70d361f2d] [formerly 73bc74d3d5 [formerly e032f584ec1caa3c9c973d554123678f828791a7]]]
Former-commit-id: 73bc74d3d5
Former-commit-id: 8ee3d9b304 [formerly 29c8908ef7]
Former-commit-id: ebfe935ed0
 2012-10-24 15:27:56 -05:00
Steve Harris
9b0cf384e7 Merge branch 'ss_builds' (12.11.1-10) into development 
Former-commit-id: af3161539a [formerly e8e3ef530c] [formerly af3161539a [formerly e8e3ef530c] [formerly 1b2cb0db6c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]]]
Former-commit-id: 1b2cb0db6c
Former-commit-id: 28dccc0278 [formerly 19dca3feca]
Former-commit-id: 73004dd45a
 2012-10-24 15:15:14 -05:00
Steve Harris
03c572edba 12.11.1-10 baseline 
Former-commit-id: 63dddc5f5f [formerly e845c605e6] [formerly 63dddc5f5f [formerly e845c605e6] [formerly 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]
Former-commit-id: 0ba69044a2
Former-commit-id: 61224dec54 [formerly cc21977c35]
Former-commit-id: 19c4526e61
 2012-10-24 15:13:57 -05:00
Ron Anderson
119dd2f93e 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 bd5537e63d [formerly e226e41852] [formerly e0b809db9f [formerly f00655f5c5fb53af0682313e5054124a459b9649]]]
Former-commit-id: e0b809db9f
Former-commit-id: a0402bb612 [formerly 56a04517a8]
Former-commit-id: d7de405506
 2012-10-24 14:11:30 -05:00
Steve Harris
35c2a8e26f 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 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]
Former-commit-id: 1807100932
Former-commit-id: 8486da2fd3 [formerly 892e4df811]
Former-commit-id: 8a17564ba3
 2012-10-18 16:01:05 -05:00
Steve Harris
9c597c7060 12.11.1-6 baseline 
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
 2012-10-18 15:53:01 -05:00
Steve Harris
13cdd55545 12.11.1-5 baseline 
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70 [formerly e31c1e5bba]
Former-commit-id: dff8d5de9c
 2012-10-18 15:46:42 -05:00
Ben Steffensmeier
a225ea9cd9 Issue #189 fix unified grid problems found during install/upgrade on testbed 
Former-commit-id: f3331dc743 [formerly 830a8bd7c2] [formerly f3331dc743 [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]]
Former-commit-id: 90b815d412
Former-commit-id: db2c9b41ec [formerly ea2f15c0df]
Former-commit-id: e5679af21a
 2012-10-18 13:27:37 -05:00
Steve Harris
35e34308c5 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
 2012-10-16 13:27:07 -05:00
Steve Harris
0ad4e4f39a 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 8b7665418a [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: f0121b6fa8 [formerly 63da835aef]
Former-commit-id: 99147526f9
 2012-10-16 09:20:37 -05:00
Steve Harris
c25ebcdc41 12.11.1-3 baseline 
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 725b2f8ba5 [formerly 5723fb0031]
Former-commit-id: bf1f88482b
 2012-10-15 16:30:31 -05:00
Nate Jensen
1efcd36987 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default 
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: cbc2da0c06 [formerly f2cbf0c5c3] [formerly cbc2da0c06 [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 93143bbda0 [formerly 5bdf9d4d38]
Former-commit-id: 319c4cda2b
 2012-10-12 15:16:27 -05:00
Ben Steffensmeier
29777154bb Merge branch 'ss_builds' into Unified_Grid 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: de3769129c [formerly 8b7256b1ae] [formerly de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: fde1e73d58 [formerly fed5a35af3]
Former-commit-id: b2fdd9283d
 2012-10-12 12:45:50 -05:00
Ron Anderson
9a588ce114 Issue #1091 Fixed combination file generation. 
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: c264f72a53 [formerly 4ca413a222] [formerly c264f72a53 [formerly 4ca413a222] [formerly 510cabe655 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]]
Former-commit-id: 510cabe655
Former-commit-id: 488d357413 [formerly e0fc2a36c6]
Former-commit-id: 47da164ca6
 2012-10-12 10:32:36 -05:00