Nate Jensen
0cff122d9c
Issue #2361 remove ISerializableObject for some pointdata and user roles classes
...
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005
Former-commit-id: 3fa7b3de6733842c240959030023e84c844ef760
2013-10-09 18:03:11 -05:00
Brad Gonzales
73e757c284
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
...
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: f776626738e4cc995bb16e87b8da66ff90289bd8
2013-10-09 17:58:12 -05:00
Bryan Kowal
37d1dd492b
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 2e6b76af19b308392e90dfee4c950200ec5c2560
2013-10-09 17:07:10 -05:00
David Gillingham
dda31532a4
Issue #2418 : Fix parameter naming issue in PHISH parameter info file.
...
Change-Id: I96dc326eba20ffa7c267248fd12343347e1ea93b
Former-commit-id: c1244e64aeeda450462592bb46ea6bede17ee219
2013-10-09 14:44:55 -05:00
Ron Anderson
f3118d421c
Merge "Issue #2418 : Add display support for pSurge 2.0 data in GFE." into development
...
Former-commit-id: 3b0b5e51da60b3b5d347d7325be376abb5902da8
2013-10-09 14:00:21 -05:00
Richard Peter
1a664aed21
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
rpms/awips2.cave/Installer.cave-feature/component.spec
Former-commit-id: fee86c220c12c09c714245fa8666bc08f4f9775b
2013-10-09 13:14:06 -05:00
Richard Peter
d8df407119
Merge "Issue #2402 Modify grib decoder to work on file extents. Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9" into development
...
Former-commit-id: 06caa25b31163ceb228982fc7e5e51b5bc8f33a0
2013-10-09 13:13:18 -05:00
Ben Steffensmeier
7d2b48de48
Issue #2402 Modify grib decoder to work on file extents.
...
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: 1525772d1b42348f0eca78fc966d2c7878496ea7
2013-10-09 12:50:02 -05:00
Ben Steffensmeier
52beccc5c9
Issue #2457 Improve error messages for missing radar icao.
...
Former-commit-id: ef0680d3f4acfa64d90af2e074f6642d1386d3ab
2013-10-09 12:11:27 -05:00
Nate Jensen
7cecf177fe
Merge "Issue #2402 Make PythonDecoder more extendable." into development
...
Former-commit-id: 3daa3f8284a5a65657429503c055ab34c1ebfb48
2013-10-08 16:20:43 -05:00
Bryan Kowal
aa4ea792c1
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.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.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 606030384b5fe1eb9411d4b35d3282b15b1398b4
2013-10-08 14:44:38 -05:00
Richard Peter
9adbe25ceb
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 687a47c58a0db2bb82328ffd4e36e7b3fabca542
2013-10-08 10:59:50 -05:00
Richard Peter
28760a1273
Merge "Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects" into development
...
Former-commit-id: fd76d3a72bd18a2afdce5855173a5a9b9ad9e00b
2013-10-08 10:50:59 -05:00
Bryan Kowal
5eba3290c8
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9
2013-10-08 10:35:03 -05:00
Dave Hladky
fbe4078bc5
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
...
Former-commit-id: c299ed7a5bb02980ecb30b0ab38752d2878d50a7
2013-10-08 10:25:36 -05:00
Richard Peter
31c87ab01e
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: 3ffd20d6abb05be289fb94513e78c0137f566a53
2013-10-08 09:45:27 -05:00
Max Schenkelberg
1bc2e9aa2b
Issue #2081 Created custom dataURI field converter interface for use with DataTime so toString can be left unchanged (with spaces) and dataTimes in the dataURI will also be left unchanged (with underscores). Refactored DataURIUtil to support these new field converters.
...
Change-Id: I0a3983b04a475f6fcf5f70ee89cecf6dd2e67676
Former-commit-id: 86788ab1704c381fc2d26b1891e37aed7367fd3d
2013-10-08 09:34:08 -05:00
Brad Gonzales
21acb75f24
Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
...
Amend: Refactored WMO header applier.
Fixes for WMO header applier.
Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
Removed manual ingest from registry mode.
Simplified data delivery distribution matching pattern.
Added serialize test for wfs response.
Updated comments.
Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.
Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7
Former-commit-id: 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8
2013-10-07 17:06:38 -05:00
Richard Peter
9e17d68bd1
Merge "Issue #2385 Fixed subscription backup web page" into development
...
Former-commit-id: 73b5da79892dd0781638329e4dd7be56a11e642d
2013-10-07 16:21:46 -05:00
Richard Peter
2e062048e1
Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
...
Former-commit-id: 204c2034a08cd69fc7286639f37e5ff936ecf49e
2013-10-07 16:19:11 -05:00
Nate Jensen
be30e6da89
Merge "Issue #2361 remove XML annotations from IHFS table classes" into development
...
Former-commit-id: b33d425446cac196dd7530d250790c3361762740
2013-10-07 14:21:40 -05:00
Nate Jensen
55a39d6458
Issue #2361 remove XML annotations from IHFS table classes
...
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939
Former-commit-id: 137b91fdad93d661243ecfbb60e28dc0c77b5b76
2013-10-07 13:06:05 -05:00
Richard Peter
be99174b65
Issue #2357 : Remove edex jms resource reuse by other threads.
...
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823
Former-commit-id: a13a027b07a8d080c4506748afe5882575ae6532
2013-10-07 12:38:08 -05:00
Benjamin Phillippe
2759456eb4
Issue #2385 Fixed subscription backup web page
...
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf
Former-commit-id: 8a0e996d66b57d071870b907bcf224310d4b10c8
2013-10-07 09:52:47 -05:00
Nate Jensen
adc774bee9
Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
...
Former-commit-id: a686d702002a5e01389be1fd5e72558239687080
2013-10-07 09:30:31 -05:00
David Gillingham
0fba91a985
Issue #2418 : Add display support for pSurge 2.0 data in GFE.
...
Change-Id: Ifbd6df0247c26ea250cd52430211c51cf71c7381
Former-commit-id: 840d411da94fd6267d6a91831257454595bfa66b
2013-10-04 12:58:07 -05:00
Dave Hladky
e0ec10d073
Issue #1797 Separation of gridded time and abstract time object
...
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5
2013-10-04 10:36:27 -05:00
Steve Harris
94aa71fcd1
13.5.2-8 baseline
...
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
2013-10-04 11:30:03 -04:00
Ben Steffensmeier
a5a0bf72b6
Issue #2402 Make PythonDecoder more extendable.
...
Former-commit-id: 19329b4f5a621f20bc45beedbe5acaadc84e9c2f
2013-10-03 18:19:04 -05:00
Richard Peter
5adf4298ef
Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
...
Former-commit-id: 3d09c6dedbaaa0db6b2247832a45bde8a1357786
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
236b3fe05f
Issue #2390 update grib decoder and vb to handle new storm surge parameters.
...
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209
Former-commit-id: 6de5f10b9abf900fc412f2b1e867ce339a15d41e
2013-10-03 16:30:13 -05:00
Steve Harris
8622cc6efa
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/awips2.core/Installer.java/1.6/component.spec
Former-commit-id: d1246136b73673acd22df53fee02adbd51022b4b
2013-10-03 16:04:21 -05:00
Nate Jensen
3f24b9e424
Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
...
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650
Former-commit-id: e574d96b347d79fe7aaa0f8dded8c93af1191fdd
2013-10-03 15:18:55 -05:00
Roger Ferrel
7f7064d457
Issue #2326 Added user roles for Archive case and retention.
...
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: 07785f02c3edbfd46154d9864272b58e92b26cd6
2013-10-03 12:33:26 -05:00
Max Schenkelberg
e3f6b1ea21
Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
...
Amend: Accepted ticket.
Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830
Former-commit-id: 384b8e6a02d4fffa0688993b2a2b53e974ecf493
2013-10-03 11:43:26 -05:00
Bryan Kowal
aa8691edfd
Issue #2295 - CAVE updates for ALR
...
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc
Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76
Former-commit-id: 5a76eabc142619df4c8454c3f2fe93f5283346db
2013-10-02 15:49:17 -05:00
Bryan Kowal
26cf5dad60
Issue #2272 - EDEX updates for ALR
...
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically
Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369
Former-commit-id: d1f201a579b9a0421295df26c9ad17717581073f
2013-10-02 15:49:16 -05:00
Greg Armendariz
16e36817cf
Merge "Issue #2142 fix hibernate log" into development
...
Former-commit-id: bf5cbc38c8b345830c673cda8078a62de8040335
2013-10-02 15:32:54 -05:00
Nate Jensen
ee3550654b
Issue #2142 fix hibernate log
...
Change-Id: I20cfbaacd210ec43f6228d094669b34224862549
Former-commit-id: e5d5ceb52ab2a0306c313169dddd71cf4368de17
2013-10-02 15:30:52 -05:00
Nate Jensen
4564a94369
Merge "Issue #2404 move grid reprojection style rules to common." into development
...
Former-commit-id: 942bc0600576cd0d322c4e82748ac6fbffc0548e
2013-10-02 11:21:04 -05:00
Ben Steffensmeier
a75361ad34
Issue #2404 move grid reprojection style rules to common.
...
Former-commit-id: 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa
2013-10-02 10:33:23 -05:00
Nate Jensen
dd75847b7b
Issue #2361 remove XML annotations from localization requests/responses
...
Change-Id: Ia2aa791f7e68524d19f24522c7824a977d25d58f
Former-commit-id: ef569f59ca91c73cfbfad4b062fb0110d33533d3
2013-10-02 09:09:26 -05:00
Roger Ferrel
a76fc08e93
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
...
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: 6a6159e07eddbac712e4696023c464d58ad250f7
2013-10-01 16:36:34 -05:00
Steve Harris
fc0cdf4996
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
...
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3
2013-10-01 15:34:01 -05:00
Richard Peter
463c07c3de
Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
...
Former-commit-id: 3180544d195f49196e842ddf68d1dd6f71872b18
2013-10-01 15:31:12 -05:00
Nate Jensen
265b6e7e61
Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
...
Former-commit-id: 33899872714e8b945131bc17eab63bc71af38d37
2013-10-01 15:19:56 -05:00
Richard Peter
bb9488bb92
Merge branch 'omaha_13.5.3' (13.5.2-7) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50
Former-commit-id: 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e
2013-10-01 15:06:34 -05:00
Richard Peter
e45689dbc7
Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml
Former-commit-id: b118718cd8766cf83df1a02079f92636964ca09e
2013-10-01 14:22:33 -05:00
Nate Jensen
effa4f4f26
Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
...
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7
Former-commit-id: f8d8a0033729878c8c6d94c00fd861ddc81f9d96
2013-10-01 11:25:45 -05:00
Bryan Kowal
c125b5b053
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 97612cb78e067c493f7b5a76a2a84d88c96a5094
2013-09-30 18:00:31 -05:00
