xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5408 commits 31 branches 40 tags 3.8 GiB
Commit graph

507 commits

Author SHA1 Message Date
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: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
 2014-04-25 11:06:11 -04: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: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
 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: 17477e7db1 [formerly 6a28fcb156] [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 47d9095211 [formerly 9f37f61cf8]
Former-commit-id: be574897cc
 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: fe8e6a1fa1 [formerly 4fa60427b4] [formerly fe8e6a1fa1 [formerly 4fa60427b4] [formerly f0189d61ca [formerly d7466d36140c94b5ef4e57fea25526231912e018]]]
Former-commit-id: f0189d61ca
Former-commit-id: 907d09bc20 [formerly 3954cd6bae]
Former-commit-id: 69f7034551
 2014-04-03 17:47:58 -05:00
Ben Steffensmeier
77d809f66a Issue #2874 Initial implementation of RTOFS data. 
Former-commit-id: 1c18e800b3 [formerly 55046a8e1e] [formerly 1c18e800b3 [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: aadc22091e [formerly ab8293c6a1]
Former-commit-id: d20a1a6f54
 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: 5efb16fa8b [formerly d0aeb854f5] [formerly 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 5d95d594f8 [formerly b5a2d2237f]
Former-commit-id: 3a82fa7ac6
 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: 9f332e938c [formerly d23acbdd48] [formerly 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]
Former-commit-id: 9c412e444e
Former-commit-id: 57f7e4b084 [formerly 88efccf309]
Former-commit-id: 35427557c4
 2014-03-14 11:13:30 -04:00
Brian.Dyke
be8f052cff OB_14.1.1-23 baseline 
Former-commit-id: 55918ee421 [formerly dcc2e4fd61] [formerly 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]
Former-commit-id: bc6a7bf946
Former-commit-id: e78e030b7c [formerly 8f72db144b]
Former-commit-id: c7fbd5dfe4
 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: c7d06ff946 [formerly ccb312d46f] [formerly c7d06ff946 [formerly ccb312d46f] [formerly bf0d052043 [formerly 276c38754b7f917c229750ce06d387a8b63245d4]]]
Former-commit-id: bf0d052043
Former-commit-id: ec34591f08 [formerly dae0963531]
Former-commit-id: 1049855e4d
 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: cbac19d219 [formerly 09d27e99b5] [formerly cbac19d219 [formerly 09d27e99b5] [formerly 48b6c75bb3 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]]
Former-commit-id: 48b6c75bb3
Former-commit-id: f53845738c [formerly 5d5ab33db3]
Former-commit-id: b7df208cd7
 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: 51b755a476 [formerly 873bd6b889] [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: c24108e75b [formerly 708485427e]
Former-commit-id: 61af779433
 2014-03-07 15:43:40 -06:00
Brian.Dyke
da36dde938 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 0bbf137b05 [formerly 312cd8a3e8] [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 2eec413d72 [formerly 2f94480121]
Former-commit-id: 8f2271403d
 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: dc7d6ceced [formerly 8b6263bfbd] [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 972fa3bee6 [formerly 7fbbc1e118]
Former-commit-id: 7f932399b9
 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: 26fe429c4b [formerly 1778d20745] [formerly 26fe429c4b [formerly 1778d20745] [formerly 010b7a1df5 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]
Former-commit-id: 010b7a1df5
Former-commit-id: 14844a10b6 [formerly c6dae5a81f]
Former-commit-id: 863de85b6b
 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: 6313b7af0c [formerly 2dbac1697d] [formerly 6313b7af0c [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: 57a28e817d [formerly 3fdb85c62d]
Former-commit-id: 6f5baf3984
 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: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
 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: f87d4ccf82 [formerly a007ffabf9] [formerly f87d4ccf82 [formerly a007ffabf9] [formerly 50209c2084 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]
Former-commit-id: 50209c2084
Former-commit-id: b9affa3c02 [formerly bf3a9ef7fe]
Former-commit-id: 6f32b5cc59
 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: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
 2014-02-27 15:18:26 -06:00
Brian.Dyke
f9587d39d1 OB_14.1.1-20 baseline 
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
 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: 40a653867a [formerly 4ccfe4f3c0] [formerly 40a653867a [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]
Former-commit-id: cf9c22ac99
Former-commit-id: 1df77529c3 [formerly a24cbaf683]
Former-commit-id: 3780b24792
 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: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
 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: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
 2014-02-24 13:46:48 -06:00
Brian.Dyke
f86f9f8918 OB_14.1.1-19 baseline 
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
 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: 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]
Former-commit-id: 916f657e04
Former-commit-id: 9ce06f52c4 [formerly e36ae1dd7f]
Former-commit-id: f89f664f50
 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: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
 2014-02-18 10:45:20 -06:00
Brian Clements
fa98f1c415 Issue #2755 removed subscription plugin jar from rpms 
Former-commit-id: 944a874c5b [formerly d4f3fe7629] [formerly 944a874c5b [formerly d4f3fe7629] [formerly 248db98ddf [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]]
Former-commit-id: 248db98ddf
Former-commit-id: 08bffb26ca [formerly 5faad2ccca]
Former-commit-id: a8dfacc21b
 2014-02-18 09:00:21 -06:00
Ron Anderson
7447a71c10 Issue #2788 Fix topo for large areas. 
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 3e78908bb5 [formerly fcf45916f4] [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: d9b82b4ebe [formerly 2d7c87ac84]
Former-commit-id: d298aabe40
 2014-02-13 10:10:34 -06:00
Brian.Dyke
f47dd3ef59 14.1.1-18 baseline 
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
 2014-02-11 15:52:50 -05:00
Brian.Dyke
b8f7317b9d 14.1.1-17 baseline 
Former-commit-id: f3d34b0c38 [formerly 180d1356cd] [formerly f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: f1cc9d6ee2 [formerly 947ec5fd96]
Former-commit-id: 948fffa361
 2014-02-04 12:33:46 -05:00
Greg Armendariz
30e5a6e2f9 Issue #2754 - Return commons logging to build for qpid 
Former-commit-id: c70e69147d [formerly 6d3e40d648] [formerly c70e69147d [formerly 6d3e40d648] [formerly 976edd2545 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]]
Former-commit-id: 976edd2545
Former-commit-id: b81825a668 [formerly 346d535a6c]
Former-commit-id: 851b9180ec
 2014-01-28 15:06:11 -06:00
Ron Anderson
77c132f706 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: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
 2014-01-13 17:45:20 -06:00
Steve Harris
1ca553385c 14.1.1-15 baseline 
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
 2014-01-06 14:08:08 -05:00
Richard Peter
1c743d4d44 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: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
 2013-12-17 21:04:53 -06:00
Greg Armendariz
ba43b7e1c9 Issue #2182 - Change release number 
Former-commit-id: 00fd9a7bc5 [formerly 85703b9919] [formerly 00fd9a7bc5 [formerly 85703b9919] [formerly e994e19877 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]]
Former-commit-id: e994e19877
Former-commit-id: e190469fc1 [formerly fad73466a7]
Former-commit-id: d2e4a4a504
 2013-12-17 08:46:15 -06:00
Bryan Kowal
fad82481c1 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: 0c3b22c8f2 [formerly 43008f4698] [formerly 0c3b22c8f2 [formerly 43008f4698] [formerly 120ebd045a [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 68181d3f62 [formerly fac9d72cc8]
Former-commit-id: 9e0e6662c8
 2013-12-16 16:39:10 -06:00
Steve Harris
800136d61b 14.1.1-13 baseline 
Former-commit-id: 85eebac7e2 [formerly c88b10039a] [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: 5368f23247 [formerly 61d4adc979]
Former-commit-id: ff08301890
 2013-12-12 16:59:57 -05:00
Greg Armendariz
88437251d7 Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change 
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: 57c98d4343 [formerly cb952cdb13] [formerly 57c98d4343 [formerly cb952cdb13] [formerly 2d2641ea7e [formerly 584c543fbab59889769570330e7d83529a6b733f]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: fce327c001 [formerly f5f21141a4]
Former-commit-id: f9f10703e8
 2013-12-11 13:46:27 -06:00
Bryan Kowal
c2273bbf5f Issue #2509 - re-compile grib2.so for RHEL6 64-bit 
Former-commit-id: 8f053f9fcd [formerly 187759698b] [formerly 8f053f9fcd [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: ea0243e5da [formerly eceffc3880]
Former-commit-id: 91cdeb8c89
 2013-12-05 15:53:51 -06:00
Richard Peter
ae6e34be4b Merge branch 'omaha_14.1.1' (14.1.1-11) into development 
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.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
 2013-12-05 12:12:27 -06:00
Steve Harris
e36c9ca1b6 Merge branch 'master_14.1.1' into omaha_14.1.1 
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)

Former-commit-id: a5f141a2cc [formerly cc79281795] [formerly a5f141a2cc [formerly cc79281795] [formerly ce7808a309 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]]
Former-commit-id: ce7808a309
Former-commit-id: d67709483a [formerly 7611759aaa]
Former-commit-id: 57355f5eaf
 2013-12-04 16:48:47 -06:00
Steve Harris
60f062ea59 14.1.1-12 baseline 
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
 2013-12-04 16:47:59 -05:00
Richard Peter
30862929e2 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: 760f215e8c [formerly f5f75ec629] [formerly 760f215e8c [formerly f5f75ec629] [formerly e82e1137f9 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]
Former-commit-id: e82e1137f9
Former-commit-id: ee03dcf505 [formerly 94994868fa]
Former-commit-id: b0e694483f
 2013-12-03 16:25:31 -06:00
Steve Harris
6f4e8734c8 Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: b0a61f5695 [formerly 65d5f13864] [formerly b0a61f5695 [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 1195e95c8b [formerly 6539b80ded]
Former-commit-id: 2e47683d4a
 2013-12-02 16:17:38 -06:00
Steve Harris
bfa9d638cc 14.1.1-11 baseline 
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
 2013-12-02 17:10:10 -05:00
Steve Harris
f51f520acb Issue #2297 - fixing build scripts 
Former-commit-id: f5a4aa3fd8 [formerly 193f06f545] [formerly f5a4aa3fd8 [formerly 193f06f545] [formerly 94cd37acf6 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]]
Former-commit-id: 94cd37acf6
Former-commit-id: 1914ddd079 [formerly b0516c0938]
Former-commit-id: 5346faae3d
 2013-12-02 14:57:20 -06:00
Bryan Kowal
7d66f1186d Increment python release for gridslice update. 
Former-commit-id: f413677106 [formerly 5f634773fe] [formerly f413677106 [formerly 5f634773fe] [formerly c48a946923 [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]]
Former-commit-id: c48a946923
Former-commit-id: 869781248b [formerly f7438d4fa6]
Former-commit-id: e39159052c
 2013-11-20 17:40:18 -06:00
Brian Clements
9d3df8f842 Issue #2495 changed gridslice to use correct dimension datatype 
Former-commit-id: 4c3453a657 [formerly aa24bc6fce] [formerly 4c3453a657 [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: 90601f6ff8 [formerly 05b2a015cb]
Former-commit-id: a8c2c5870c
 2013-11-19 17:53:39 -06:00
Steve Harris
fbe9de41ad Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: d1b2cdd566 [formerly 65ebfc1a18] [formerly d1b2cdd566 [formerly 65ebfc1a18] [formerly c0bb3a1102 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]
Former-commit-id: c0bb3a1102
Former-commit-id: eff32cfbf3 [formerly e8c6af3060]
Former-commit-id: 70536b40ba
 2013-11-19 15:45:06 -06:00
Steve Harris
ea65181d19 14.1.1-10 baseline 
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
 2013-11-19 16:40:25 -05:00
Steve Harris
f3604b2fc8 Merge branch 'master_13.5.3' into development_on_RHEL5 
Former-commit-id: 58325f2c17 [formerly be0f3bf912] [formerly 58325f2c17 [formerly be0f3bf912] [formerly d810aacaaa [formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]
Former-commit-id: d810aacaaa
Former-commit-id: c86e70be8c [formerly 8ca6f8d14b]
Former-commit-id: 4f6e7095a3
 2013-11-15 13:19:01 -06:00