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

556 commits

Author SHA1 Message Date
Richard Peter
efd1003a50 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: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
 2014-04-09 16:00:54 -05:00
Brian.Dyke
2eec862ebb Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: 6a28fcb156
Former-commit-id: 17477e7db1
 2014-04-04 12:57:32 -04:00
Brad Gonzales
9ff7dd12aa 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: f0189d61ca [formerly 4fa60427b4 [formerly d7466d36140c94b5ef4e57fea25526231912e018]]
Former-commit-id: 4fa60427b4
Former-commit-id: fe8e6a1fa1
 2014-04-03 17:47:58 -05:00
Ben Steffensmeier
9e2e500040 Issue #2874 Initial implementation of RTOFS data. 
Former-commit-id: 12ed72b0c0 [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]
Former-commit-id: 55046a8e1e
Former-commit-id: 1c18e800b3
 2014-03-24 11:10:18 -05:00
Steve Harris
1dd9192564 Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]
Former-commit-id: d0aeb854f5
Former-commit-id: 5efb16fa8b
 2014-03-17 15:55:41 -05:00
Brian.Dyke
e85e3c2e70 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: 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]
Former-commit-id: d23acbdd48
Former-commit-id: 9f332e938c
 2014-03-14 11:13:30 -04:00
Brian.Dyke
b24e7a66d8 OB_14.1.1-23 baseline 
Former-commit-id: bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]
Former-commit-id: dcc2e4fd61
Former-commit-id: 55918ee421
 2014-03-14 08:18:16 -04:00
Brad Gonzales
57b81b8031 Issue #2702 Updated openfire version in component spec. 
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498

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

Former-commit-id: f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: 873bd6b889
Former-commit-id: 51b755a476
 2014-03-07 15:43:40 -06:00
Brian.Dyke
e1cc8eb59a Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]
Former-commit-id: 312cd8a3e8
Former-commit-id: 0bbf137b05
 2014-03-07 08:57:07 -05:00
Steve Harris
08dbf1f7ea Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]
Former-commit-id: 8b6263bfbd
Former-commit-id: dc7d6ceced
 2014-03-06 18:31:10 -06:00
Brian.Dyke
8c54df9e0c ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change) 
Former-commit-id: 010b7a1df5 [formerly 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]
Former-commit-id: 1778d20745
Former-commit-id: 26fe429c4b
 2014-03-06 11:04:34 -05:00
Brian.Dyke
e5972b7159 ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf) 
Former-commit-id: cb1b4a7ac5 [formerly 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]
Former-commit-id: 2dbac1697d
Former-commit-id: 6313b7af0c
 2014-03-06 10:56:44 -05:00
Steve Harris
52226061e9 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: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
 2014-03-06 08:39:43 -06:00
Brad Gonzales
bdadb0266b 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: 50209c2084 [formerly a007ffabf9 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]
Former-commit-id: a007ffabf9
Former-commit-id: f87d4ccf82
 2014-02-28 10:15:18 -06:00
Richard Peter
79d3aa4e1a 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: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
 2014-02-27 15:18:26 -06:00
Brian.Dyke
2613e13e08 OB_14.1.1-20 baseline 
Former-commit-id: 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 324696c436
Former-commit-id: b2401d2f0d
 2014-02-26 17:39:15 -05:00
Brad Gonzales
e31b98bb85 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: cf9c22ac99 [formerly 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]
Former-commit-id: 4ccfe4f3c0
Former-commit-id: 40a653867a
 2014-02-25 14:42:59 -06:00
Brian.Dyke
9158806dd2 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7 
Former-commit-id: 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 2faab606e5
Former-commit-id: 363403fb34
 2014-02-24 14:51:00 -05:00
Ron Anderson
049424e5f0 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: 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]
Former-commit-id: 4364e7497c
Former-commit-id: 45ccac0859
 2014-02-24 13:46:48 -06:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline 
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
 2014-02-21 06:50:59 -05:00
Brian.Dyke
45cf129ad7 ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev) 
Former-commit-id: 916f657e04 [formerly 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]
Former-commit-id: 2f79cc486e
Former-commit-id: 5f3ca0a3f4
 2014-02-20 15:50:50 -05:00
Ron Anderson
410f956cff 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: 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 32bcf9d0d0
Former-commit-id: e7f2b6883d
 2014-02-18 10:45:20 -06:00
Brian Clements
fa44883db0 Issue #2755 removed subscription plugin jar from rpms 
Former-commit-id: 248db98ddf [formerly d4f3fe7629 [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]
Former-commit-id: d4f3fe7629
Former-commit-id: 944a874c5b
 2014-02-18 09:00:21 -06:00
Ron Anderson
69ee4792ad Issue #2788 Fix topo for large areas. 
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]
Former-commit-id: fcf45916f4
Former-commit-id: 3e78908bb5
 2014-02-13 10:10:34 -06:00
Brian.Dyke
1f27652aa3 14.1.1-18 baseline 
Former-commit-id: 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 575e328123
Former-commit-id: f05a2220cd
 2014-02-11 15:52:50 -05:00
Brian.Dyke
4c6eb0c001 14.1.1-17 baseline 
Former-commit-id: 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 180d1356cd
Former-commit-id: f3d34b0c38
 2014-02-04 12:33:46 -05:00
Greg Armendariz
7481545364 Issue #2754 - Return commons logging to build for qpid 
Former-commit-id: 976edd2545 [formerly 6d3e40d648 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]
Former-commit-id: 6d3e40d648
Former-commit-id: c70e69147d
 2014-01-28 15:06:11 -06:00
Ron Anderson
2e8cbade9f 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: 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: ba7a25a88f
Former-commit-id: 0bde38cef3
 2014-01-13 17:45:20 -06:00
Steve Harris
c6cb11a5f4 14.1.1-15 baseline 
Former-commit-id: d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]
Former-commit-id: 8bbd803ace
Former-commit-id: f88ff2bde9
 2014-01-06 14:08:08 -05:00
Richard Peter
cc89b16338 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: 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]
Former-commit-id: 1de516964b
Former-commit-id: e4f59ea119
 2013-12-17 21:04:53 -06:00
Greg Armendariz
7219a81337 Issue #2182 - Change release number 
Former-commit-id: e994e19877 [formerly 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]
Former-commit-id: 85703b9919
Former-commit-id: 00fd9a7bc5
 2013-12-17 08:46:15 -06:00
Bryan Kowal
b2550c873b 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: 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]
Former-commit-id: 43008f4698
Former-commit-id: 0c3b22c8f2
 2013-12-16 16:39:10 -06:00
Steve Harris
a2ae393ec1 14.1.1-13 baseline 
Former-commit-id: b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]
Former-commit-id: c88b10039a
Former-commit-id: 85eebac7e2
 2013-12-12 16:59:57 -05:00
Greg Armendariz
74c49f1eee Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change 
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: 2d2641ea7e [formerly cb952cdb13 [formerly 584c543fbab59889769570330e7d83529a6b733f]]
Former-commit-id: cb952cdb13
Former-commit-id: 57c98d4343
 2013-12-11 13:46:27 -06:00
Bryan Kowal
e907393567 Issue #2509 - re-compile grib2.so for RHEL6 64-bit 
Former-commit-id: 5b8a8ddbeb [formerly 187759698b [formerly 90958e13e98147130848aad26d077e7a040ddb51]]
Former-commit-id: 187759698b
Former-commit-id: 8f053f9fcd
 2013-12-05 15:53:51 -06:00
Richard Peter
ba577ff354 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: a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: 0c4ae068ad
Former-commit-id: b3b23647b4
 2013-12-05 12:12:27 -06:00
Steve Harris
655c9931e4 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: ce7808a309 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]
Former-commit-id: cc79281795
Former-commit-id: a5f141a2cc
 2013-12-04 16:48:47 -06:00
Steve Harris
f53eb87892 14.1.1-12 baseline 
Former-commit-id: a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: b24d9c80b0
Former-commit-id: 371d1ca63c
 2013-12-04 16:47:59 -05:00
Richard Peter
7969ef9648 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: e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: f5f75ec629
Former-commit-id: 760f215e8c
 2013-12-03 16:25:31 -06:00
Steve Harris
d33e61a80e Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]
Former-commit-id: 65d5f13864
Former-commit-id: b0a61f5695
 2013-12-02 16:17:38 -06:00
Steve Harris
401ee156b8 14.1.1-11 baseline 
Former-commit-id: 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 70a6f1936e
Former-commit-id: 337b138200
 2013-12-02 17:10:10 -05:00
Steve Harris
35d141a1ce Issue #2297 - fixing build scripts 
Former-commit-id: 94cd37acf6 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]
Former-commit-id: 193f06f545
Former-commit-id: f5a4aa3fd8
 2013-12-02 14:57:20 -06:00
Bryan Kowal
1557e44d70 Increment python release for gridslice update. 
Former-commit-id: c48a946923 [formerly 5f634773fe [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]
Former-commit-id: 5f634773fe
Former-commit-id: f413677106
 2013-11-20 17:40:18 -06:00
Brian Clements
dc7ad4d465 Issue #2495 changed gridslice to use correct dimension datatype 
Former-commit-id: 5e7f2f0bdf [formerly aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]
Former-commit-id: aa24bc6fce
Former-commit-id: 4c3453a657
 2013-11-19 17:53:39 -06:00
Steve Harris
70c79bb7e6 Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: c0bb3a1102 [formerly 65ebfc1a18 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]
Former-commit-id: 65ebfc1a18
Former-commit-id: d1b2cdd566
 2013-11-19 15:45:06 -06:00
Steve Harris
69cef95302 14.1.1-10 baseline 
Former-commit-id: 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: ca0f65bd9a
Former-commit-id: 8251107646
 2013-11-19 16:40:25 -05:00
Steve Harris
5ef89f10a1 Merge branch 'master_13.5.3' into development_on_RHEL5 
Former-commit-id: d810aacaaa [formerly be0f3bf912 [formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]
Former-commit-id: be0f3bf912
Former-commit-id: 58325f2c17
 2013-11-15 13:19:01 -06:00
Steve Harris
f7878c44cb Merge branch 'omaha_14.1.1' (14.1.1-9) into development 
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 0a36987a01
Former-commit-id: 542a0946f2
 2013-11-15 13:15:25 -06:00