233 commits

Author	SHA1	Message	Date
Steve Harris	bbfc0f76ef	Merge branch 'omaha_13.3.1' into development ... Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]] Former-commit-id: 5c9a6b83cc Former-commit-id: 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe] Former-commit-id: 0f53c46d7a	2013-04-04 11:58:50 -05:00
Steve Harris	b2de6fd4c1	Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1 ... Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]] Former-commit-id: 327d05f3b5 Former-commit-id: 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456] Former-commit-id: 0342b648b6	2013-04-03 15:52:19 -05:00
Steve Harris	a196ebc11b	13.3.1-18 baseline ... Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]] Former-commit-id: ce6a06a7e3 Former-commit-id: 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762] Former-commit-id: 0edd049e3b	2013-04-03 14:58:29 -05:00
Bryan Kowal	55b84c59c6	Issue #1850 - the ebxml schema will now be created within the metadata database ... Former-commit-id: 3d13334576 [formerly d6e3d52126] [formerly 8d63244b4e] [formerly 2dbd62e9ce [formerly 8d63244b4e [formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]] Former-commit-id: 2dbd62e9ce Former-commit-id: 57767b7c64c0b9fe7114780c1b2b46960afdf9dc [formerly b31ade0770] Former-commit-id: a57a457c79	2013-04-02 10:49:46 -05:00
Steve Harris	47c7f66f2b	Merge branch 'omaha_13.3.1' into development ... Conflicts: 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/reference/MapManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java Former-commit-id: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]] Former-commit-id: 437a04011a Former-commit-id: 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314] Former-commit-id: 7b27767d7e	2013-04-01 12:19:04 -05:00
Steve Harris	12055591ea	Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1 ... Conflicts: rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE Former-commit-id: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]] Former-commit-id: 14c9de2259 Former-commit-id: a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82] Former-commit-id: f85a1ab9ab	2013-04-01 12:15:04 -05:00
Steve Harris	a6ff543f88	13.3.1-17 baseline ... Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]] Former-commit-id: a3fe998f8f Former-commit-id: 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7] Former-commit-id: ef413da5f7	2013-04-01 12:04:56 -05:00
Bryan Kowal	0e463b7bc9	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 Former-commit-id: a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly e3c39b9be6 [formerly 2819e8fe48 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]] Former-commit-id: e3c39b9be6 Former-commit-id: 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a7] Former-commit-id: fa5825b0c5	2013-03-28 16:00:27 -05:00
Bryan Kowal	cf87439189	Issue #1821 - re-compile grib2.so 32-bit and 64-bit ... Former-commit-id: d3a2525705 [formerly 203a3d5200] [formerly 7622471ed01b2742f90976cf09d5b178db585bbf [formerly da99727625]] [formerly 2da2b370db [formerly da99727625 [formerly f7f382d880134acb2f84bef990302aa91784c2d2]]] Former-commit-id: 2da2b370db Former-commit-id: e0118a2e7c08a69d3c453f036763cc1d265db530 [formerly 998fbe8769] Former-commit-id: 131e260337	2013-03-28 09:48:27 -05:00
Steve Harris	b7beed13a5	Merge branch 'omaha_13.3.1' into development ... Conflicts: cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]] Former-commit-id: 3073951b3d Former-commit-id: e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7] Former-commit-id: 6e48567370	2013-03-27 22:16:15 -05:00
Steve Harris	3f99eed860	Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 ... Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE Change-Id: I6b2513155d566aa09571c280b46cf309028a9861 Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]] Former-commit-id: d997aeaee4 Former-commit-id: d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03] Former-commit-id: 428ec8a472	2013-03-27 18:21:05 -05:00
Steve Harris	3cbf22bd96	13.3.1-14 baseline ... Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]] Former-commit-id: 9fba973fd0 Former-commit-id: 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0] Former-commit-id: 936e4adda2	2013-03-27 17:59:34 -05:00
Roger Ferrel	dea028c7fc	Issue #1828 Fix intlsigmets and text pattern. ... Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0 Former-commit-id: df2a9d8f96 [formerly 6a4bd66abc] [formerly 19074d3053] [formerly 74389834de [formerly 19074d3053 [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]] Former-commit-id: 74389834de Former-commit-id: ac5853bb00b807a9281ab41fb9a03069a5f9ac8e [formerly 4c5aa32169] Former-commit-id: 7244b4d23c	2013-03-26 14:47:48 -05:00
Steve Harris	6e4b9a6f01	Merge branch 'omaha_13.3.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]] Former-commit-id: 65df96a419 Former-commit-id: db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a] Former-commit-id: 5bb29627dc	2013-03-26 12:47:40 -05:00
Steve Harris	072b1bf35e	Merge branch 'master_13.3.1' into omaha_13.3.1 ... Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly b2bd9214d65cc3e496eea474a3c067a766511a95 [formerly e71c69c383]] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]] Former-commit-id: 9ff8a94193 Former-commit-id: 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3] Former-commit-id: 02147470db	2013-03-26 12:44:24 -05:00
Steve Harris	b49c1b0fa8	13.3.1-13 baseline ... Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]] Former-commit-id: c65f3e68e5 Former-commit-id: 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709] Former-commit-id: 4f2e9aec0d	2013-03-26 12:43:07 -05:00
Bryan Kowal	154bedca1d	Issue #1750 - include the qpidd service script in the rpm installations ... Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de Former-commit-id: 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 21fa510eaa [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]] Former-commit-id: 21fa510eaa Former-commit-id: 1488501309286ce57335dc6761ded04fe446c3fa [formerly db39a45c88] Former-commit-id: f8fafc8d4a	2013-03-25 16:52:33 -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
Richard Peter	fced329e1c	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: d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]] Former-commit-id: 4c3fcf3b67 Former-commit-id: 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5] Former-commit-id: 4b386ccd1c	2013-03-21 18:21:53 -05:00
Greg Armendariz	8550ade3ba	Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development ... Former-commit-id: 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]] Former-commit-id: 85113a66b6 Former-commit-id: 3a1d4dd5377fe137da9052d33161f1179569101d [formerly ccabddace6] Former-commit-id: 1884b6dce3	2013-03-21 12:55:59 -05:00
Bryan Kowal	95b9e9b751	Issue #1750 - add clean scriptlet to pgadmin3 rpm specification ... Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694 Former-commit-id: 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 5b15c6fcaa [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]] Former-commit-id: 5b15c6fcaa Former-commit-id: 77e7359cd424f1e3096c107873683b66ceb81137 [formerly 8141f49211] Former-commit-id: 88b0c2e120	2013-03-21 10:04:29 -05:00
Bryan Kowal	854ae5b462	Issue #1663 - awips2-database will no longer install site-specific databases. ... - removed the sql scripts for the obsolete hydro databases - the hydro databases will now be installed by the site-specific localization rpms - the database imports and associated db files that are not actually part of localization will be purged by the localization rpm once it is finished with them Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6 Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]] Former-commit-id: 722d068105 Former-commit-id: 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e] Former-commit-id: ac0ef6e7b9	2013-03-21 09:50:48 -05:00
Steve Harris	0a86e74ea5	Merge branch 'omaha_13.3.1' into development ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]] Former-commit-id: 0379be06d2 Former-commit-id: 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba] Former-commit-id: 8db98c2d71	2013-03-20 16:09:26 -05:00
Steve Harris	2cbd2a1bc9	Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 ... Conflicts: cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]] Former-commit-id: dc419068f0 Former-commit-id: 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1] Former-commit-id: f4e26fd94d	2013-03-20 16:06:20 -05:00
Steve Harris	dbeb388d72	13.3.1-10 baseline ... Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]] Former-commit-id: 7078eec1b1 Former-commit-id: 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26] Former-commit-id: e9f0328808	2013-03-20 15:53:01 -05:00
Bryan Kowal	c7403dffe2	Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base ... Former-commit-id: fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]] Former-commit-id: 74b4bb0891 Former-commit-id: 3ba7c5a5f785e32de3db6c45c7f138af8ec9aa79 [formerly 7628860bfe] Former-commit-id: 6b8538f7f5	2013-03-19 13:27:38 -05:00
Steve Harris	027eda5dce	Merge branch 'omaha_13.3.1' into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]] Former-commit-id: 7fcf9f1cb2 Former-commit-id: 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde] Former-commit-id: 2a26783ba7	2013-03-18 16:52:00 -05:00
Steve Harris	0e9919f6be	Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 ... Conflicts (just history comments): cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]] Former-commit-id: c18b96dc4c Former-commit-id: e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8] Former-commit-id: ea27f9cd17	2013-03-18 16:43:22 -05:00
Bryan Kowal	9d8b41c8c7	Issue #1741 - what was once two is now one ... - a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature - this rpm will install the CAVE and/or EDEX artifacts Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]] Former-commit-id: 7fd035256d Former-commit-id: 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec] Former-commit-id: 3e8d5449fc	2013-03-18 16:36:33 -05:00
Steve Harris	2fd4ac9397	13.3.1-8 baseline ... Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]] Former-commit-id: c15b3ffe20 Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea] Former-commit-id: 81a3f29afc	2013-03-18 15:43:32 -05:00
Bryan Kowal	0b6a31d7ca	Issue #1663 - PostgreSQL Upgrade ... - we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source - we are building pgadmin3 1.16.1 from source - we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3 - the following extensions are also built with PostgreSQL: * geos 3.3.7 * postgis 2.0.2 * proj 4.8.0 * gdal 1.9.2 - database creation scripts and configuration have been updated for compatibility - removed remaining references to prefixed psql and postgresql rpms - removed unused sql scripts from the baseline - we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file - updated the postgresql jdbc drivers Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8 Former-commit-id: 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]] Former-commit-id: 5e86ef080e Former-commit-id: 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024] Former-commit-id: f6139755a5	2013-03-13 14:44:05 -05:00
Dave Hladky	68114535f2	Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 ... Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]] Former-commit-id: 5dc454c7ef Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8] Former-commit-id: 9e97fc9efe	2013-03-13 13:56:33 -05:00
Steve Harris	45a2d0501d	13.3.1-7 baseline ... Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]] Former-commit-id: e12ed113ae Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca] Former-commit-id: ed5f1dbab6	2013-03-13 09:50:28 -05:00
Steve Harris	f92bc8f3d4	13.3.1-6.1 baseline ... Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]] Former-commit-id: a062803c8c Former-commit-id: 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330] Former-commit-id: 2e1dbdc10d	2013-03-13 08:28:26 -05:00
Steve Harris	47cde9bd09	Merge branch 'omaha_13.3.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java Former-commit-id: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]] Former-commit-id: 0cd7e56e65 Former-commit-id: 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015] Former-commit-id: bca46a1354	2013-03-12 16:04:23 -05:00
Dave Hladky	eefd544e4b	Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 ... Conflicts: 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 edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java ncep/com.raytheon.uf.edex.ncep.feature/feature.xml Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227 Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]] Former-commit-id: 4b08491880 Former-commit-id: ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de] Former-commit-id: 155903d135	2013-03-12 15:48:34 -05:00
Steve Harris	0cec06c171	13.3.1-6 baseline ... Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]] Former-commit-id: 566b677d09 Former-commit-id: d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b] Former-commit-id: 6fe4b16924	2013-03-12 08:35:45 -05:00
Steve Harris	1709c34b8f	Merge branch 'omaha_13.3.1' into development ... Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]] Former-commit-id: aa0e9acefd Former-commit-id: 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8] Former-commit-id: 4a0b8772ec	2013-03-05 12:29:44 -06:00
Steve Harris	7ff64bf8cc	Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 ... Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]] Former-commit-id: 57f42761d7 Former-commit-id: 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62] Former-commit-id: b423579e4a	2013-03-05 12:27:49 -06:00
Steve Harris	aabd5cd51f	13.3.1-5 baseline ... Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]] Former-commit-id: e26f7eb151 Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe] Former-commit-id: a240379588	2013-03-05 10:47:06 -06:00
Steve Harris	4bfbb518c0	13.3.1-4 baseline ... Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]] Former-commit-id: 2edca90902 Former-commit-id: c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9] Former-commit-id: 3e0614b43a	2013-03-05 10:39:59 -06:00
Bryan Kowal	553f988935	Issue #1750 - edexBridge will now set the QPID persistence flag ... Change-Id: I84132466da523b7ce193cdd38adef85c76828a98 Former-commit-id: b407a34461 [formerly d484acbca0] [formerly 3a8efd5edf] [formerly 8b4dce1c3d [formerly 3a8efd5edf [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]] Former-commit-id: 8b4dce1c3d Former-commit-id: 7570c6107ddb950a2b736fd6b01c90c29e178ab4 [formerly eba8ccc6cd] Former-commit-id: 0d9400b2ec	2013-03-04 17:58:04 -06:00
Bryan Kowal	0a93a4a25c	Issue #1739 - fix Wes2Bridge ... Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814 Former-commit-id: 18a778cb8c [formerly 9022c53d53] [formerly 20d3c6bcaa] [formerly 86a1f16e37 [formerly 20d3c6bcaa [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]] Former-commit-id: 86a1f16e37 Former-commit-id: 12218fd7f3fba3ae75003e4e79567e4ffd54c4d1 [formerly ed6e1003ff] Former-commit-id: 5958c0a876	2013-03-01 11:49:09 -06:00
Bryan Kowal	e005f18132	Issue #1739 - updates for recent CAVE and EDEX feature-refactoring ... - resolved EDEX rpm naming conflict - resolved CAVE junit dependency issue Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc Former-commit-id: 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]] Former-commit-id: 4faf8aefbe Former-commit-id: 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892] Former-commit-id: c4709b1bfb	2013-02-28 18:09:25 -06:00
Bryan Kowal	6f57b06d52	Issue #1638 - update CAVE rpm name generation ... Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f Former-commit-id: 37e9c0cb20 [formerly a9123a2b84] [formerly b8496877ff] [formerly 5eb888fb98 [formerly b8496877ff [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]] Former-commit-id: 5eb888fb98 Former-commit-id: 16e35fbbb02090042f28676c5c7015864604ab11 [formerly 22acca8f3d] Former-commit-id: da0d99d22f	2013-02-28 14:43:53 -06:00
Richard Peter	f3528bedea	Merge "Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm" into development ... Former-commit-id: bcd6b4d82b [formerly b354ebb862] [formerly 6c766ddd85] [formerly 84e1b2f999 [formerly 6c766ddd85 [formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]] Former-commit-id: 84e1b2f999 Former-commit-id: 1d88c5c600f75ba32fbd740729eacc1432ef74f4 [formerly 9fa37933e6] Former-commit-id: 0f1c3dd256	2013-02-27 11:43:18 -06:00
Steve Harris	f30d1cdf87	Merge branch 'development' into omaha_13.3.1 ... Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]] Former-commit-id: 6ec9e73035 Former-commit-id: bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1] Former-commit-id: e46625f8f2	2013-02-25 15:58:48 -06:00
Bryan Kowal	ec53fa98cd	Issue #1634 - force added wrapper jars in bin directory ... Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48 Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]] Former-commit-id: d5c8b82941 Former-commit-id: e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010] Former-commit-id: 53b9e69868	2013-02-22 09:28:37 -06:00
Steve Harris	7e48d3e684	Merge branch 'development' into omaha_13.3.1 ... Conflicts: cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]] Former-commit-id: 2641d578e2 Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1] Former-commit-id: 4f155a183a	2013-02-21 15:41:39 -06:00
Bryan Kowal	6a47017449	Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper ... - disabled the startup of the admin web application in the jetty container - removed configuration and libraries specific to the tanuki java service wrapper - updated the rpm build and developer deployment - added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log... Former-commit-id: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]] Former-commit-id: 803397c7c7 Former-commit-id: 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c] Former-commit-id: b2a0a7c148	2013-02-21 13:55:28 -06:00