Commit graph

622 commits

Author SHA1 Message Date
Greg Armendariz
e1d91769fe Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]
Former-commit-id: 58eaf444bd
2014-04-30 19:34:43 -05:00
Brian Clements
a074b27951 Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: 57f5ac701c [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]
Former-commit-id: 1273846844
2014-04-30 16:41:14 -05:00
Greg Armendariz
784235ab9f Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]
Former-commit-id: 2d38c69ac1
2014-04-30 15:42:42 -05:00
Richard Peter
80d4153878 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: 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 32957285fc
2014-04-28 16:27:40 -05:00
Brian.Dyke
029f5753ad 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: fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: 3524838f9f
2014-04-25 11:06:11 -04:00
Richard Peter
d08c051727 Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: b53d914640 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]
Former-commit-id: a21a2bafe1
2014-04-24 15:43:15 -05:00
Brad Gonzales
5fa1165519 Issue #3035 Increment java component.spec revision value.
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf

Former-commit-id: 15985b9eac [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]
Former-commit-id: 7a0694adca
2014-04-24 12:48:40 -05:00
David Gillingham
9f27fa7562 Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec

Former-commit-id: eea20ba3ef [formerly 0b91ae192358aa162833fb332ba4e551878199f9]
Former-commit-id: 16adfb2573
2014-04-24 11:11:06 -05:00
Brad Gonzales
679a623d87 Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1

Former-commit-id: fdfac581d6 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]
Former-commit-id: 1fcffc5db8
2014-04-22 15:39:08 -05:00
Brad Gonzales
17ac32a672 Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build.
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca

Former-commit-id: 90c7e699fa [formerly 254c7e0298ba7fb3ad91af2d51a1bd41b0535631]
Former-commit-id: 4c21afaa1b
2014-04-22 12:23:15 -05:00
Brian.Dyke
72618c4214 Merged 13.5.5-1 into 1412
Former-commit-id: 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]
Former-commit-id: 35ad867281
2014-04-16 12:09:12 -04:00
Nate Jensen
cf3e9e9020 Merge "Issue #2984 another attempt to fix build" into development
Former-commit-id: 5424ffb850 [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]
Former-commit-id: 26b20a770a
2014-04-15 13:27:29 -05:00
Nate Jensen
60b8b6e4ad Issue #2984 another attempt to fix build
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb

Former-commit-id: a2354a1d2a [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]
Former-commit-id: 09305d263e
2014-04-15 13:16:17 -05:00
Richard Peter
35b8b8bc15 Issue #2726: Fix context mappings for topics
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f

Former-commit-id: ecbd0d5720 [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]
Former-commit-id: 4ac996336e
2014-04-15 12:49:15 -05:00
Richard Peter
fa5c0f71ad 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: 4709e66b34 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]
Former-commit-id: fa25d55384
2014-04-15 11:50:28 -05:00
Nate Jensen
f6b3c3c05f Issue #2984 attempt to fix build
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d

Former-commit-id: 4aaa7c7096 [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]
Former-commit-id: 456359ab1a
2014-04-15 09:57:11 -05:00
Richard Peter
73aab15d85 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: 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: b15d288530
2014-04-09 16:00:54 -05:00
Brian.Dyke
9f37f61cf8 Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: dd98c213c7
2014-04-04 12:57:32 -04:00
Brad Gonzales
3954cd6bae 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: 4fa60427b4 [formerly d7466d36140c94b5ef4e57fea25526231912e018]
Former-commit-id: f0189d61ca
2014-04-03 17:47:58 -05:00
Ben Steffensmeier
ab8293c6a1 Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]
Former-commit-id: 12ed72b0c0
2014-03-24 11:10:18 -05:00
Steve Harris
b5a2d2237f Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]
Former-commit-id: 0c2c5ad4bd
2014-03-17 15:55:41 -05:00
Brian.Dyke
88efccf309 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: d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]
Former-commit-id: 9c412e444e
2014-03-14 11:13:30 -04:00
Brian.Dyke
8f72db144b OB_14.1.1-23 baseline
Former-commit-id: dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]
Former-commit-id: bc6a7bf946
2014-03-14 08:18:16 -04:00
Brad Gonzales
dae0963531 Issue #2702 Updated openfire version in component spec.
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498

Former-commit-id: ccb312d46f [formerly 276c38754b7f917c229750ce06d387a8b63245d4]
Former-commit-id: bf0d052043
2014-03-12 08:48:36 -05:00
Brad Gonzales
5d5ab33db3 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: 09d27e99b5 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]
Former-commit-id: 48b6c75bb3
2014-03-11 11:27:44 -05:00
Steve Harris
708485427e Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]
Former-commit-id: f60aba35d6
2014-03-07 15:43:40 -06:00
Brian.Dyke
2f94480121 Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]
Former-commit-id: 6414bdab57
2014-03-07 08:57:07 -05:00
Steve Harris
7fbbc1e118 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]
Former-commit-id: 1c64a5c025
2014-03-06 18:31:10 -06:00
Brian.Dyke
c6dae5a81f ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]
Former-commit-id: 010b7a1df5
2014-03-06 11:04:34 -05:00
Brian.Dyke
3fdb85c62d ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]
Former-commit-id: cb1b4a7ac5
2014-03-06 10:56:44 -05:00
Steve Harris
96658d8ce0 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: 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: ffcc34f8d4
2014-03-06 08:39:43 -06:00
Brad Gonzales
bf3a9ef7fe 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: a007ffabf9 [formerly 5ea4e87d10d335d85547b147228244892772a98f]
Former-commit-id: 50209c2084
2014-02-28 10:15:18 -06:00
Richard Peter
f13c86bc3e 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: 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 1c150e6e8b
2014-02-27 15:18:26 -06:00
Brian.Dyke
16117255f3 OB_14.1.1-20 baseline
Former-commit-id: 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]
Former-commit-id: 2bad40cfee
2014-02-26 17:39:15 -05:00
Brad Gonzales
a24cbaf683 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: 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]
Former-commit-id: cf9c22ac99
2014-02-25 14:42:59 -06:00
Brian.Dyke
227131e5f1 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]
Former-commit-id: 1a8a0b703e
2014-02-24 14:51:00 -05:00
Ron Anderson
3b2ea2d6ac 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: 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]
Former-commit-id: 2db5f26840
2014-02-24 13:46:48 -06:00
Brian.Dyke
64044e7ce5 OB_14.1.1-19 baseline
Former-commit-id: cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: 10b723647b
2014-02-21 06:50:59 -05:00
Brian.Dyke
e36ae1dd7f ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]
Former-commit-id: 916f657e04
2014-02-20 15:50:50 -05:00
Ron Anderson
d4ba9eba94 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: 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 14a082a4e9
2014-02-18 10:45:20 -06:00
Brian Clements
5faad2ccca Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: d4f3fe7629 [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]
Former-commit-id: 248db98ddf
2014-02-18 09:00:21 -06:00
Ron Anderson
2d7c87ac84 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]
Former-commit-id: 2f067699f2
2014-02-13 10:10:34 -06:00
Brian.Dyke
c5857c30f2 14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]
Former-commit-id: 1d6a9456b7
2014-02-11 15:52:50 -05:00
Brian.Dyke
947ec5fd96 14.1.1-17 baseline
Former-commit-id: 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]
Former-commit-id: 23280af290
2014-02-04 12:33:46 -05:00
Greg Armendariz
346d535a6c Issue #2754 - Return commons logging to build for qpid
Former-commit-id: 6d3e40d648 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]
Former-commit-id: 976edd2545
2014-01-28 15:06:11 -06:00
Ron Anderson
624375267e Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.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/general/GeneralGridData.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/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: 62c445d872
2014-01-13 17:45:20 -06:00
Steve Harris
35d8f5a281 14.1.1-15 baseline
Former-commit-id: 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]
Former-commit-id: d8e5799328
2014-01-06 14:08:08 -05:00
Richard Peter
62fa535744 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]
Former-commit-id: 2e7fd9ddba
2013-12-17 21:04:53 -06:00
Greg Armendariz
fad73466a7 Issue #2182 - Change release number
Former-commit-id: 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]
Former-commit-id: e994e19877
2013-12-17 08:46:15 -06:00
Bryan Kowal
fac9d72cc8 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]
Former-commit-id: 120ebd045a
2013-12-16 16:39:10 -06:00