Steve Harris
82045e2409
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 848519177dcf62cf4a6e848519177dcf62cf4a6efc2bf6b45cfc2bf6b45c32f255cada233922471a74a325ce74
2014-05-12 16:13:19 -05:00
Ana Rivera
94ceb3698f
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
...
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 7e74e047a091715e7a3f7e74e047a091715e7a3f81a9d4fa4481a9d4fa44e33c6e2d6988520fc2068cb1bfc3b8
2014-05-12 18:55:06 +00:00
Brian.Dyke
464cc1a479
CM-MERGE:OB13.5.5-5 into 14.1.2
...
Former-commit-id: 3aa2f7974b386ec058e13aa2f7974b386ec058e141ba5fc34841ba5fc348dc5bc1d2a42f704c898d82663c0ab6
2014-05-12 14:07:11 -04:00
Brad Gonzales
ce306f188b
Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm.
...
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b
Former-commit-id: c71a842639982503cb41c71a842639982503cb41abf6125958abf61259589679fb32dcb032306b527e434f3ae1
2014-05-12 11:25:16 -05:00
Brian Clements
2aa0a7ad2b
Omaha #3147 removed spring from groovy RPM component spec
...
Former-commit-id: 9d67a6c30b3bb680802a9d67a6c30b3bb680802ab334038a28b334038a286192ab51ae3a48b2036ef989cbe948
2014-05-09 10:31:28 -05:00
Brad Gonzales
4e4ebd83a9
Omaha #3032 updated jdk to java 1.7.0_55
...
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8
Former-commit-id: ad464cc0da91f94499aaad464cc0da91f94499aa35f6a5ac2535f6a5ac256bee1ed107f7cf5741b0617e84afa7
2014-05-08 16:15:42 -05:00
Steve Harris
ab4d7cc569
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
...
Former-commit-id: a7211a72f0c3509757f0a7211a72f0c3509757f00392577b6c0392577b6c8c5eb7774e6694af2d5e7819c2878f
2014-05-07 08:45:41 -05:00
Richard Peter
e555144511
Issue #3102 : Fix edexBridge connection leak
...
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 2668f09447501980904d2668f09447501980904db091a8827ab091a8827a8f1b5b647dd03c47719f87c6348e61
2014-05-06 10:32:31 -05:00
Sathya.Sankarasubbu
47bb8dfc50
ASM #560 - LDM 6.11.5 GRIB library causing crash
...
Modified Release number in component.spce from 10 to 11
Change-Id: I2f011e472688fa63d605db5d715f1aef6589a966
Former-commit-id: 23102eaa8fedd543c48d23102eaa8fedd543c48d1246776d3e1246776d3e386091eb781309866bb86268f58f94
2014-05-05 14:33:20 -04:00
Steve Harris
4fe84ba0fd
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 9e149df7996ef3b9f1e59e149df7996ef3b9f1e51c8f2f61851c8f2f6185927a87b126b797b4b1fa17318b1870
2014-05-05 08:21:02 -05:00
Greg Armendariz
4066e1c518
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
...
Former-commit-id: 29947536361e48076fb229947536361e48076fb258eaf444bd58eaf444bd9f6eff005be1d91769fe733b64a851
2014-04-30 19:34:43 -05:00
Brian Clements
170d78b62b
Issue #3089 fixed init.d script for collaboration dataserver RPM
...
Former-commit-id: e49d15033257f5ac701ce49d15033257f5ac701c127384684412738468449fc8796247a074b27951d1c9dbcc28
2014-04-30 16:41:14 -05:00
Greg Armendariz
e9ba949734
Issue #2571 - Update maps.db snapshot and lake shapefile
...
Former-commit-id: 4c245da2a24981b6a4384c245da2a24981b6a4382d38c69ac12d38c69ac194a55e5c31784235ab9f2cd476cc62
2014-04-30 15:42:42 -05:00
Richard Peter
938e39a0fc
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 67683dd89144b178246167683dd89144b178246132957285fc32957285fc6966b7924680d415387824a3fe1466
2014-04-28 16:27:40 -05:00
Brian.Dyke
f31d8cc8cf
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: f0b8ea5822fb1f5aa593f0b8ea5822fb1f5aa5933524838f9f3524838f9fbf3758efa3029f5753adc6d3fe6952
2014-04-25 11:06:11 -04:00
Richard Peter
547d2f5333
Merge "Issue #3068 : Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
...
Former-commit-id: c0656c811db53d914640c0656c811db53d914640a21a2bafe1a21a2bafe1608b342707d08c051727d71cbdb5f9
2014-04-24 15:43:15 -05:00
Brad Gonzales
036fbb9cf7
Issue #3035 Increment java component.spec revision value.
...
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf
Former-commit-id: 86036c0afb15985b9eac86036c0afb15985b9eac7a0694adca7a0694adcaf9b04639a45fa1165519d35d7c0b5e
2014-04-24 12:48:40 -05:00
David Gillingham
99b4c52d36
Issue #3068 : Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
...
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec
Former-commit-id: 6186e67e5ceea20ba3ef6186e67e5ceea20ba3ef16adfb257316adfb2573123bd80fa99f27fa7562aaa1340f81
2014-04-24 11:11:06 -05:00
Brad Gonzales
4e5664e0a2
Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
...
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1
Former-commit-id: 5957c45ceafdfac581d65957c45ceafdfac581d61fcffc5db81fcffc5db8c11506a0c9679a623d87da2d3c0fe9
2014-04-22 15:39:08 -05:00
Brad Gonzales
3fb2ac5ee2
Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build.
...
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca
Former-commit-id: 3a3e0be7a490c7e699fa3a3e0be7a490c7e699fa4c21afaa1b4c21afaa1b258ddf903617ac32a67255e11bf157
2014-04-22 12:23:15 -05:00
Brian.Dyke
73efa466f9
Merged 13.5.5-1 into 1412
...
Former-commit-id: 65ad515a6e188d84cc8765ad515a6e188d84cc8735ad86728135ad867281c0266e898872618c4214737283b94a
2014-04-16 12:09:12 -04:00
Nate Jensen
9621b9f8bf
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 7f56e20c035424ffb8507f56e20c035424ffb85026b20a770a26b20a770a0c82511428cf3e9e9020146d8259db
2014-04-15 13:27:29 -05:00
Nate Jensen
eb9fba0305
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: cb406ef865a2354a1d2acb406ef865a2354a1d2a09305d263e09305d263e3186527f1860b8b6e4ad529939f3d3
2014-04-15 13:16:17 -05:00
Richard Peter
c4edd6fd84
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: f533275291ecbd0d5720f533275291ecbd0d57204ac996336e4ac996336ed40449dae935b8b8bc15100a0d3bbd
2014-04-15 12:49:15 -05:00
Richard Peter
64c9dbb764
Issue #2726 : Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
...
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d
Former-commit-id: 45e6301b914709e66b3445e6301b914709e66b34fa25d55384fa25d553847e3e0fb984fa5c0f71ad4ed2eb3b03
2014-04-15 11:50:28 -05:00
Nate Jensen
24e970b87a
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: ce585ca9e44aaa7c7096ce585ca9e44aaa7c7096456359ab1a456359ab1a0177329d67f6b3c3c05fc5ad3ae2a2
2014-04-15 09:57:11 -05:00
Richard Peter
421b2716a4
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 567609044395eba8dcf6567609044395eba8dcf6b15d288530b15d288530f1b85f696473aab15d85b667e0509f
2014-04-09 16:00:54 -05:00
Brian.Dyke
39b5e7fe67
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 17477e7db16a28fcb15617477e7db16a28fcb156dd98c213c7dd98c213c747d90952119f37f61cf8be574897cc
2014-04-04 12:57:32 -04:00
Brad Gonzales
cd22105a5e
Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
...
rpm to replace it. Changed dependency references to httpd-collaboration to refer to collab-dataserver.
Amend: Updated call to status in init script.
Redirect start.sh error output to an error file.
Use macro to define ant opts in component.spec.
Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4
Former-commit-id: fe8e6a1fa14fa60427b4fe8e6a1fa14fa60427b4f0189d61caf0189d61ca907d09bc203954cd6bae69f7034551
2014-04-03 17:47:58 -05:00
Ben Steffensmeier
77d809f66a
Issue #2874 Initial implementation of RTOFS data.
...
Former-commit-id: 1c18e800b355046a8e1e1c18e800b355046a8e1e12ed72b0c012ed72b0c0aadc22091eab8293c6a1d20a1a6f54
2014-03-24 11:10:18 -05:00
Steve Harris
a936941dff
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: 5efb16fa8bd0aeb854f55efb16fa8bd0aeb854f50c2c5ad4bd0c2c5ad4bd5d95d594f8b5a2d2237f3a82fa7ac6
2014-03-17 15:55:41 -05:00
Brian.Dyke
5fb2fe9266
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9f332e938cd23acbdd489f332e938cd23acbdd489c412e444e9c412e444e57f7e4b08488efccf30935427557c4
2014-03-14 11:13:30 -04:00
Brian.Dyke
be8f052cff
OB_14.1.1-23 baseline
...
Former-commit-id: 55918ee421dcc2e4fd6155918ee421dcc2e4fd61bc6a7bf946bc6a7bf946e78e030b7c8f72db144bc7fbd5dfe4
2014-03-14 08:18:16 -04:00
Brad Gonzales
0a973030c4
Issue #2702 Updated openfire version in component spec.
...
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: c7d06ff946ccb312d46fc7d06ff946ccb312d46fbf0d052043bf0d052043ec34591f08dae09635311049855e4d
2014-03-12 08:48:36 -05:00
Brad Gonzales
0b558f0c93
Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work
...
with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.
Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a
Former-commit-id: cbac19d21909d27e99b5cbac19d21909d27e99b548b6c75bb348b6c75bb3f53845738c5d5ab33db3b7df208cd7
2014-03-11 11:27:44 -05:00
Steve Harris
ed7921643c
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476873bd6b88951b755a476873bd6b889f60aba35d6f60aba35d6c24108e75b708485427e61af779433
2014-03-07 15:43:40 -06:00
Brian.Dyke
da36dde938
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 0bbf137b05312cd8a3e80bbf137b05312cd8a3e86414bdab576414bdab572eec413d722f944801218f2271403d
2014-03-07 08:57:07 -05:00
Steve Harris
d65c768373
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: dc7d6ceced8b6263bfbddc7d6ceced8b6263bfbd1c64a5c0251c64a5c025972fa3bee67fbbc1e1187f932399b9
2014-03-06 18:31:10 -06:00
Brian.Dyke
0c6ba63abc
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 26fe429c4b1778d2074526fe429c4b1778d20745010b7a1df5010b7a1df514844a10b6c6dae5a81f863de85b6b
2014-03-06 11:04:34 -05:00
Brian.Dyke
36e0ad0fdd
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: 6313b7af0c2dbac1697d6313b7af0c2dbac1697dcb1b4a7ac5cb1b4a7ac557a28e817d3fdb85c62d6f5baf3984
2014-03-06 10:56:44 -05:00
Steve Harris
2db5dcf6eb
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 3ba28aabea069093884f3ba28aabea069093884fffcc34f8d4ffcc34f8d4587f15a95d96658d8ce036a0533f19
2014-03-06 08:39:43 -06:00
Brad Gonzales
b428cf44ca
Issue #2821 Removed qpid 0.7 from the baseline.
...
Amend: Removed build.sh script that builds 0.7 and 0.18. changed rpms.sh to call 0.18 build.sh script.
Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf
Former-commit-id: f87d4ccf82a007ffabf9f87d4ccf82a007ffabf950209c208450209c2084b9affa3c02bf3a9ef7fe6f32b5cc59
2014-02-28 10:15:18 -06:00
Richard Peter
5fab51d41b
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: 7bd6a079130e25ae35c17bd6a079130e25ae35c11c150e6e8b1c150e6e8b50a1b270c5f13c86bc3e9b3f8f9649
2014-02-27 15:18:26 -06:00
Brian.Dyke
f9587d39d1
OB_14.1.1-20 baseline
...
Former-commit-id: b2401d2f0d324696c436b2401d2f0d324696c4362bad40cfee2bad40cfeec873f20d0416117255f35feadbe4d9
2014-02-26 17:39:15 -05:00
Brad Gonzales
d1ef377ec0
Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
...
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz. Updated the component.spec to the new version number.
Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3
Former-commit-id: 40a653867a4ccfe4f3c040a653867a4ccfe4f3c0cf9c22ac99cf9c22ac991df77529c3a24cbaf6833780b24792
2014-02-25 14:42:59 -06:00
Brian.Dyke
0bcf7c89b8
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 363403fb342faab606e5363403fb342faab606e51a8a0b703e1a8a0b703e73a1c238f4227131e5f138829b9014
2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 45ccac08594364e7497c45ccac08594364e7497c2db5f268402db5f268407d3af157f83b2ea2d6acf2b0cc20e8
2014-02-24 13:46:48 -06:00
Brian.Dyke
f86f9f8918
OB_14.1.1-19 baseline
...
Former-commit-id: 779553142ccfa4997978779553142ccfa499797810b723647b10b723647bc41dd22ff264044e7ce51b359c2564
2014-02-21 06:50:59 -05:00
Brian.Dyke
176c56b8ea
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
...
Former-commit-id: 5f3ca0a3f42f79cc486e5f3ca0a3f42f79cc486e916f657e04916f657e049ce06f52c4e36ae1dd7ff89f664f50
2014-02-20 15:50:50 -05:00
Ron Anderson
8a7af092f2
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: e7f2b6883d32bcf9d0d0e7f2b6883d32bcf9d0d014a082a4e914a082a4e90135771eecd4ba9eba9468e03bf02f
2014-02-18 10:45:20 -06:00
