Ron Anderson
f44ac32b1e
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
...
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59
2014-09-30 14:09:31 -05:00
Brad Gonzales
f0189d61ca
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: d7466d36140c94b5ef4e57fea25526231912e018
2014-04-03 17:47:58 -05:00
Richard Peter
e82e1137f9
Merge branch 'development_on_RHEL5' (GOES-R) into development
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 039d9ecb587338801cdab9cad11b06890517d6a4
2013-12-03 16:25:31 -06:00
Steve Harris
94cd37acf6
Issue #2297 - fixing build scripts
...
Former-commit-id: 3725a48cbdec19842d7c4e3facf737fc507e69dc
2013-12-02 14:57:20 -06:00
Bryan Kowal
0544b66f4e
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638
2013-11-13 13:16:55 -06:00
Bryan Kowal
d76033ff3d
Issue #2297 - update build scripts to complete the full delta build
...
Former-commit-id: b605c29ae839ca7950bc04426f09eb310587a18f
2013-11-12 17:43:10 -06:00
Richard Peter
460a7b8b5d
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.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/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
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.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 333073fc97c9d454d0e41f8fbe01be3a19b18184
2013-11-12 11:11:36 -06:00
Steve Harris
4190ddf39b
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Former-commit-id: 9d433d2ae29831903e8da23a4b96aee29ee8f5bd
2013-11-11 11:40:03 -06:00
Steve Harris
5fa893d37b
13.5.3-6 baseline
...
Former-commit-id: 1324512098c1b95d023de932c6fbe872cfeb68f8
2013-11-11 12:34:10 -05:00
Steve Harris
47778131b0
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 433ccf0db5946e18c81e20ec689c9911868fe4c2
2013-11-07 11:32:42 -06:00
Steve Harris
f175680b89
13.5.3-5 baseline
...
Former-commit-id: 427119d391ffb23c0db3fa0dab0a893322a60f8c
2013-11-07 12:22:32 -05:00
Steve Harris
18609de83d
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Former-commit-id: dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72
2013-11-01 13:23:28 -05:00
Steve Harris
da7d1ce05e
13.5.3-4 baseline
...
Former-commit-id: 103d478433e8d0aad0599511c30ef0792f854d13
2013-11-01 14:20:00 -04:00
Bryan Kowal
c8d7a32e2e
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9
2013-10-31 15:34:46 -05:00
Steve Harris
855b444073
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Former-commit-id: ec141b61f8f0558ff18d1d67492a066c837f20b7
2013-10-31 11:58:04 -05:00
Steve Harris
1503847a4b
13.5.3-3 baseline
...
Former-commit-id: c261e0753eb106a2912314056a1b4903695750c5
2013-10-31 12:52:07 -04:00
Bryan Kowal
326144970c
Re-enable the build of the awips2 rpm.
...
Former-commit-id: 65ab48743eecfebde890b51a1c74f9a0d68506bf
2013-10-30 15:24:01 -05:00
Steve Harris
83d2194a5a
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 7466036a36f9fc8eafbac605e44e46cfade0f4a4
2013-10-30 12:36:53 -05:00
Steve Harris
6d85d944a6
13.5.3-2 baseline
...
Former-commit-id: 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f
2013-10-30 12:53:25 -04:00
Steve Harris
972339d60f
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
...
Former-commit-id: 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4
2013-10-28 14:39:22 -05:00
Steve Harris
5739b4f832
14.1.1-3 baseline
...
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
2013-10-28 10:46:02 -04:00
Steve Harris
30f65c2858
13.5.3-1 baseline
...
Former-commit-id: 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e
2013-10-28 10:30:57 -04:00
Steve Harris
ca54ffaad1
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: 7233d9cff9df6668f967810d8bd09c99e4ad2807
2013-10-25 10:51:42 -05:00
Steve Harris
e7b1702032
13.5.2-13 baseline
...
Former-commit-id: f931b3b75bd2581c8942b43d73dff02de4362ecf
2013-10-25 10:06:56 -04:00
Steve Harris
bcb531e671
13.5.2-12 baseline
...
Former-commit-id: 7918a1bb18c212f8a3b84edec932880126d351be
2013-10-25 09:59:15 -04:00
Steve Harris
cbfde2f52a
13.5.2-11 baseline
...
Former-commit-id: de1a605c7e59fea76f937d328a68c15209ab5b06
2013-10-25 09:45:58 -04:00
Bryan Kowal
542f5f2349
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
d9eae3ea28
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
Steve Harris
18325949fb
13.5.2-8 baseline
...
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
2013-10-04 11:30:03 -04:00
Richard Peter
271a8d753e
Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
Former-commit-id: 14284eb34f246c2d283ecf4040996957d7117cd3
2013-09-24 12:29:16 -05:00
Steve Harris
3837fbe670
13.5.2-6 baseline
...
Former-commit-id: 726299a49759971bf9a79ca7598c4f39ecb6721c
2013-09-23 10:03:15 -04:00
Steve Harris
3b296a33b0
13.5.1-19 baseline
...
Former-commit-id: f3acac4ea9a285e64104a55db5b76593147c15e4
2013-09-03 09:48:08 -04:00
Steve Harris
9e4bf0cf2e
13.5.2-2 baseline
...
Former-commit-id: 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9
2013-08-29 15:01:29 -04:00
Steve Harris
542b2c3d18
13.5.2-1 baseline
...
Former-commit-id: a362ca91ee5972a1501a2842191fbe2e23feac9c
2013-08-28 09:43:48 -04:00
Steve Harris
0a7acf96c7
13.5.1-18 baseline
...
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
2013-08-22 09:12:43 -04:00
Greg Armendariz
5577e686c1
13.5.1-13 baseline
...
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Steve Harris
dfbf9a5afe
13.5.1-8 baseline
...
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Steve Harris
86ce1248c2
13.5.1-7 baseline
...
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Steve Harris
e197f23ce3
13.5.1-4 baseline
...
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
72d22a30c9
13.5.1-3 baseline
...
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
fe872355a7
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
18b90226a2
13.4.1-14 baseline
...
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
2013-06-06 15:15:27 -04:00
Steve Harris
c0376ce9ed
13.4.1-11 baseline
...
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
2013-05-21 09:19:25 -04:00
Steve Harris
8347bed50e
13.4.1-7 baseline
...
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
16fe8cc5a2
13.4.1-6 baseline
...
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
2013-05-07 08:47:39 -04:00
Steve Harris
7a78f8ac6e
13.4.1-4 baseline
...
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
2013-05-02 10:00:38 -05:00
Steve Harris
00332e6305
13.4.1-1 baseline
...
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
abaf9f12f9
13.3.1-19 baseline
...
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
2013-04-09 08:37:12 -05:00
Steve Harris
ce6a06a7e3
13.3.1-18 baseline
...
Former-commit-id: 245ab5d951a10e74aba53b036001316e1c7653fe
2013-04-03 14:58:29 -05:00
Steve Harris
a3fe998f8f
13.3.1-17 baseline
...
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
