Commit graph

27 commits

Author SHA1 Message Date
Richard Peter
f186912fe1 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]
Former-commit-id: aff520d61b
2013-05-17 10:33:18 -05:00
Bryan Kowal
4a6d46f29c Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
Former-commit-id: 3abd701fa4 [formerly 17101171b6] [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 1e726506e0 [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: a6b1893a7952d3070c7de78ed3013e85240b36c9 [formerly 37461e68dd]
Former-commit-id: 3812567894
2013-05-16 11:00:47 -05:00
Bryan Kowal
92db4c4121 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: e02ad5d555 [formerly e1794dd03f] [formerly f9e77e90b7] [formerly 0e3e3e891b [formerly f9e77e90b7 [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 464ade86d03b34790349312571541113105fb8b1 [formerly 0af34bbe4c]
Former-commit-id: 1fccd55036
2013-05-15 11:55:56 -05:00
Richard Peter
8917cc0b8d Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: c2dcbedf63 [formerly ae84ced7be] [formerly 4f3e86574b] [formerly 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]
Former-commit-id: 697297803c
Former-commit-id: c40599aa14bfde53120b5b8c8af969cd6cc57c9e [formerly cfaeeaff5f]
Former-commit-id: 139c234452
2013-05-08 17:28:01 -05:00
Bryan Kowal
3a2154b47a Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: a6d15fcb3c [formerly a55331f29f] [formerly bc39afbd24] [formerly 4513b65ad6 [formerly bc39afbd24 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]]
Former-commit-id: 4513b65ad6
Former-commit-id: 03bfba28c50e2f18676d3107bbdc7bf11245386b [formerly 0c511e1d87]
Former-commit-id: ecac3f4403
2013-05-08 14:53:29 -05:00
Richard Peter
e4f3d60d90 Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
	pythonPackages/qpid/bin/qpid-queue-count
	pythonPackages/qpid/bin/qpid-stat
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
	rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/x86_64/build.sh
	tests/.classpath

Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb

Former-commit-id: d11666193f [formerly 17a5f519cc] [formerly 39b90191a6e347610683f41fb7bca631ffab07d3 [formerly 083700d315]] [formerly 2b496de6d8 [formerly 083700d315 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]
Former-commit-id: 2b496de6d8
Former-commit-id: a57ab1971925eee09755783786207fd3536b9553 [formerly 349bcc15d7]
Former-commit-id: 398e808300
2013-05-05 14:25:36 -05:00
Richard Peter
9e6ee9fabb Issue #1814: Update Slow Consumer to have max depth of 100M
Change-Id: I53bd0260622d0fc79d16141b9d64ea2cb5b28310

Former-commit-id: f76d9b3365 [formerly 26ab9ac0d4] [formerly a3c86efdd1] [formerly 630eda8286 [formerly a3c86efdd1 [formerly fc038aa3edb9c017a926fc3124eb35966b55aa4f]]]
Former-commit-id: 630eda8286
Former-commit-id: f33bc71e69b91cdf85a94570aa8c37a17d6b8fa5 [formerly 917320fb4f]
Former-commit-id: f7e5d72cec
2013-05-03 09:25:48 -05:00
Steve Harris
7d085660f8 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]
Former-commit-id: 4357e2dacc
2013-05-02 10:00:38 -05:00
Steve Harris
aecc3cfd89 13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: 00332e6305
Former-commit-id: fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]
Former-commit-id: 0e950655f1
2013-04-24 17:15:55 -05:00
Bryan Kowal
b5a50b9c2a Issue #1805 - adding missing qpid changeset to 13.4
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used
- source jars will no longer be included in the rpms
- merged specs patch file

Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: 2ec2c5abd5 [formerly 1f868d391f] [formerly d7b463f6a4] [formerly f3dfe43098 [formerly d7b463f6a4 [formerly 2d38533790815d569a957702f6f4b122de9bcd62]]]
Former-commit-id: f3dfe43098
Former-commit-id: d5652654570fb393d1a73c8839756c183fd8d9d4 [formerly fd40278c71]
Former-commit-id: 29d65b3161
2013-04-24 13:44:49 -05:00
Bryan Kowal
02f01470fc Issue #1814 - use the AWIPS II log4j.xml for qpid
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 35b956fc4c [formerly e00a6207a5 [formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]
Former-commit-id: 35b956fc4c
Former-commit-id: a0bd420b00b18b43fbffb1d90f2d5c751a02e44a [formerly cbc2742070]
Former-commit-id: 49b9046bb4
2013-04-15 16:38:00 -05:00
Richard Peter
227dcdbd81 Issue #1814: Change baseline memory configuration and baseline default log configuration
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: 81749b9af5 [formerly c10d2f7520] [formerly d96b372f4834807452672a72b6ba1c34f171250f [formerly 0c869ee231]] [formerly 78b230aaaf [formerly 0c869ee231 [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]
Former-commit-id: 78b230aaaf
Former-commit-id: 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc]
Former-commit-id: a281d26608
2013-04-15 12:52:40 -05:00
Bryan Kowal
c9666aa999 Issue #1750 - qpid updates for compatibility with operational servers
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: dd911d33bc [formerly 7af4c80bab] [formerly 1000dac7ad] [formerly 1cea2404c8 [formerly 1000dac7ad [formerly e30dff6e530b247c01d6ff4cff826abcda92ff29]]]
Former-commit-id: 1cea2404c8
Former-commit-id: 9883b0093f4fbc3aaa265cddbe9d5db095bd7555 [formerly 22a2c082b8]
Former-commit-id: 8c20b1f4bc
2013-04-04 13:20:13 -05:00
Bryan Kowal
5cb707736a Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 52fc0c66c2 [formerly 0d252800ee] [formerly a07f8076cf] [formerly 3454fd030b [formerly a07f8076cf [formerly 790804146d4eade073e3250e1b1cd95e313b1a96]]]
Former-commit-id: 3454fd030b
Former-commit-id: 61a29a2dc8e795045f30b007407d07cd9e3cc057 [formerly 3dadeb157d]
Former-commit-id: 59b2e35928
2013-04-04 13:12:07 -05:00
Richard Peter
d1369dbf29 Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]
Former-commit-id: 814bff6ddb
Former-commit-id: ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]
Former-commit-id: e9fe732dac
2013-04-04 13:03:41 -05:00
Steve Harris
bb30a41300 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]
Former-commit-id: f80f98cee2
2013-03-25 13:27:13 -05:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
424c32bd5d 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
11e448aa39 12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]
Former-commit-id: 8bc60b1e32
2012-03-30 08:38:33 -05:00
David Gillingham
9cc2c09ae5 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e]
Former-commit-id: 3c4e90e0bf
2012-03-13 12:31:38 -05:00
Bryan Kowal
3e1e672233 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly b871752e3a [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]
Former-commit-id: b871752e3a
Former-commit-id: 3df9a673b587901bb723b61fae9fe68a607983cf [formerly 638d2c964b]
Former-commit-id: d04bc82c9a
2012-03-08 09:00:55 -06:00
David Gillingham
038b850981 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly 78c7f29096 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]
Former-commit-id: 78c7f29096
Former-commit-id: f703d811132f818c9f224c92beac74aea6d8f0ec [formerly 8a86e910aa]
Former-commit-id: 5e2b3c3955
2012-03-07 16:05:54 -06:00
Bryan Kowal
69f4822ad1 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 9a1c04ec5f94674baf45e393882ffe09f7582171 [formerly 65e1e4ee0b]] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]
Former-commit-id: ea1c82452b
Former-commit-id: e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]
Former-commit-id: 9f6780c4dd
2012-01-20 13:38:00 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00