Nate Jensen
|
46f902852f
|
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
Former-commit-id: 0398aeaa5b [formerly 49c2079963] [formerly 0398aeaa5b [formerly 49c2079963] [formerly 31637efbbc [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]
Former-commit-id: 31637efbbc
Former-commit-id: 9158625765 [formerly 8944e220f6]
Former-commit-id: 25602f0183
|
2012-11-14 16:09:00 -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 |
|
Ben Steffensmeier
|
e57c669f2e
|
Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 3d126b41e1 [formerly 2c8f3f09ac] [formerly 3d126b41e1 [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 47759f025b [formerly 91254adfd6]
Former-commit-id: 84abe4fa4f
|
2012-11-14 12:22:53 -06:00 |
|
Ben Steffensmeier
|
35b855635f
|
Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]
Former-commit-id: fbed67a208
Former-commit-id: d75b59622a [formerly 7c9341a3a6]
Former-commit-id: 40a07f8998
|
2012-11-08 14:34:55 -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 |
|
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 |
|
Richard Peter
|
7df04375f1
|
Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: 5787d6278d [formerly 275398778f] [formerly 5787d6278d [formerly 275398778f] [formerly 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]]]
Former-commit-id: 886375172b
Former-commit-id: 998278caf7 [formerly bd1d87363a]
Former-commit-id: 940d986f6d
|
2012-10-31 18:19:44 -05:00 |
|
Steve Harris
|
2d928d328e
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
84d0f1fbb6
|
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: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
|
2012-07-27 14:44:44 -05:00 |
|
Steve Harris
|
36e2ad3023
|
12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
bc580915da
|
Issue #704 - update build.properties files for python.
Former-commit-id: 70b71ec2e3 [formerly dda06c5d8e] [formerly 70b71ec2e3 [formerly dda06c5d8e] [formerly b1a1448256 [formerly 88840dea400d8df50e273365d81b5180ab06fb11]]]
Former-commit-id: b1a1448256
Former-commit-id: a122cd2458 [formerly ef557a1fdb]
Former-commit-id: 6fd5f9303d
|
2012-06-26 10:26:29 -05:00 |
|
Bryan Kowal
|
96e82f60e5
|
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: cb16805e7e [formerly 95a5887b06] [formerly cb16805e7e [formerly 95a5887b06] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 5db24885ba [formerly fd8be91fed]
Former-commit-id: f390151c0b
|
2012-06-19 13:15:53 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
0c25458510
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Ben Steffensmeier
|
70cf1d2ad5
|
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: a2db6975c9 [formerly 4dedc8b30d] [formerly a2db6975c9 [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: d937284ab2 [formerly d5d8697d9f]
Former-commit-id: 92962fdd2c
|
2012-02-23 10:49:56 -06:00 |
|
Steve Harris
|
3aef320ffd
|
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: 92084b3f20 [formerly d0bbbfefcc] [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719]
Former-commit-id: ae9c52b012
|
2012-02-23 10:06:18 -06:00 |
|
Ben Steffensmeier
|
50d560a874
|
Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a
Former-commit-id: 3c673896a0 [formerly b3463d27fc] [formerly 3c673896a0 [formerly b3463d27fc] [formerly 0d75fbf942 [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 8b1cdd8db1 [formerly c22f135dbc]
Former-commit-id: 713811bb95
|
2012-01-30 16:39:57 -06:00 |
|
Nate Jensen
|
ddd16336c7
|
Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d
Former-commit-id: fae8fd5a6d [formerly 8e3730adbf] [formerly fae8fd5a6d [formerly 8e3730adbf] [formerly 1dabb12dce [formerly 0c82def5c753aab240848aac8dc906a161461ac3]]]
Former-commit-id: 1dabb12dce
Former-commit-id: 802607c79f [formerly 9c4ad58867]
Former-commit-id: 5809ed0f9b
|
2012-01-24 12:15:01 -06:00 |
|
Nate Jensen
|
532df5ba35
|
Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: 6366bc35cb [formerly fe52a35f7a] [formerly 6366bc35cb [formerly fe52a35f7a] [formerly 33756de9c8 [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]
Former-commit-id: 33756de9c8
Former-commit-id: 7301ad5c66 [formerly 3b7a082f41]
Former-commit-id: ef5349fb63
|
2012-01-24 09:59:50 -06:00 |
|
Nate Jensen
|
503584ebb4
|
Issue #181 integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf
Former-commit-id: 873469f771 [formerly f96e6a822b] [formerly 873469f771 [formerly f96e6a822b] [formerly a015cc136b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]]]
Former-commit-id: a015cc136b
Former-commit-id: ba529c4a12 [formerly e951995736]
Former-commit-id: df4f492e7d
|
2012-01-24 09:49:27 -06:00 |
|
Bryan Kowal
|
7afea63245
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 971bf802ac [formerly 2142afe3f1] [formerly 971bf802ac [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: a1dbdff475 [formerly 2a7b92ec91]
Former-commit-id: 3bcecdfe66
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|