Commit graph

413 commits

Author SHA1 Message Date
Richard Peter
e07982bf6d Merge "Issue #2240 Fix incorrect environment assumptions" into development
Former-commit-id: 6b91e4573c [formerly 60cd44b5a5] [formerly 3c8f6762fe] [formerly d997b1b0fe [formerly 3c8f6762fe [formerly 8894c03f3db89e44ddc97d1ca897130670291687]]]
Former-commit-id: d997b1b0fe
Former-commit-id: e5a7649b5337ac75fddb9721acff4c9bd6ed00c3 [formerly d3f04844c1]
Former-commit-id: 9e393f0e9b
2013-08-16 15:15:54 -05:00
Bryan Kowal
932f194bfd Issue #2164 - fix 13.6 aviation rpm
Former-commit-id: acc4983510 [formerly 46976ba44b] [formerly c113178a49] [formerly 347a886099 [formerly c113178a49 [formerly bbeb36de32df79731ace5b56d4d746b8057707f0]]]
Former-commit-id: 347a886099
Former-commit-id: e0cc1d3170104e72a50bf4f4e849903d9a98fc76 [formerly e8e67a6905]
Former-commit-id: 2a4eb86e05
2013-08-16 14:21:03 -05:00
Bryan Kowal
1e5c915b0a Issue #2164 - fix 13.6.1 CAVE build
Former-commit-id: 9f040ee969 [formerly 138d442180] [formerly 197498e784] [formerly 9e2aa969cf [formerly 197498e784 [formerly eb249e6e879bcff4cbed17edde9307e5390d3619]]]
Former-commit-id: 9e2aa969cf
Former-commit-id: 73bfc014fcd01cb0f07f2df54f6dd2393728a4c8 [formerly 7cbd9bb75c]
Former-commit-id: 87038b3d36
2013-08-16 12:40:38 -05:00
Everett Kladstrup
38a8d8268f Issue #2240 Fix incorrect environment assumptions
* using $awips_home as the prefix for java/python/psql causes
  problems on edex-environment (wes2bridge) installs; where
  $awips_home does not contain the java/python/psql installs, instead
  they are located at /awips2

Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee

Former-commit-id: 07f18003f1 [formerly 2803eded49] [formerly 535248b69b] [formerly fba53e9fe3 [formerly 535248b69b [formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]]
Former-commit-id: fba53e9fe3
Former-commit-id: 0dd804a51c987294808ac793df221d81414a3689 [formerly 6883cdc389]
Former-commit-id: b602d37357
2013-08-16 11:02:15 -05:00
Bryan Kowal
e63473681c Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: fa69d98320 [formerly dd55894802] [formerly a3a5c799fc] [formerly 7f8226d319 [formerly a3a5c799fc [formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]]
Former-commit-id: 7f8226d319
Former-commit-id: 13c28d981888a56ba89f41db6a1eb715dc47ee3c [formerly 110fb14b91]
Former-commit-id: 178b4904ef
2013-08-15 15:40:18 -05:00
Bryan Kowal
38c4f03c0a Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 18a3f63616 [formerly 4e3c577c56] [formerly 32f3e63bd5] [formerly 382cb87fa3 [formerly 32f3e63bd5 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]
Former-commit-id: 382cb87fa3
Former-commit-id: bd8c04417fd168b2227cc23f892d33fc380013fa [formerly 50ab20be95]
Former-commit-id: 6a129d3a96
2013-08-15 15:40:05 -05:00
Bryan Kowal
2a9f4d41c9 Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 23fb13a41c [formerly 7d7511af9b] [formerly 19d80d96c3] [formerly c0458d512d [formerly 19d80d96c3 [formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]
Former-commit-id: c0458d512d
Former-commit-id: b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3]
Former-commit-id: f68943aeef
2013-08-15 15:39:37 -05:00
Bryan Kowal
5ccd628305 Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: 31ee9b4bdc [formerly a962be9a15] [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]
Former-commit-id: 8b51e353f1
Former-commit-id: b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c]
Former-commit-id: 9943f3a57c
2013-08-15 15:38:11 -05:00
Bryan Kowal
33b6f03899 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]
Former-commit-id: 94eacfc460
Former-commit-id: b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]
Former-commit-id: 53124c5e02
2013-08-15 15:30:05 -05:00
Bryan Kowal
45ab6afc31 Issue #2163 - additional RHEL6 changes
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: 6e76fc6624 [formerly 5feab7c0be] [formerly bbca63a8b8] [formerly 36eca9bbfb [formerly bbca63a8b8 [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]]
Former-commit-id: 36eca9bbfb
Former-commit-id: be9ce96e1e14d369e98c21317e7f54a4d7d48430 [formerly 1f5e92aac9]
Former-commit-id: 9b62e39fff
2013-08-15 15:25:52 -05:00
Bryan Kowal
b177c46971 Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
Former-commit-id: 37ebd41ee0 [formerly 1c2ca11a33] [formerly b08a9da804] [formerly b1e4e77a13 [formerly b08a9da804 [formerly 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b]]]
Former-commit-id: b1e4e77a13
Former-commit-id: 290da1b6c7cb0a4e7ce8b2b679428c5b1cd6adc2 [formerly c97d4f42b6]
Former-commit-id: a5effbed37
2013-08-15 15:25:43 -05:00
Bryan Kowal
b1bf843307 Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
- httpd has been updated for compatibility


Former-commit-id: 3074681a82 [formerly d3f5a8ecfd] [formerly 91a84e57b5] [formerly c0614bc7d4 [formerly 91a84e57b5 [formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]]
Former-commit-id: c0614bc7d4
Former-commit-id: c5c75095cdb39d40899d94cb78da35c31632b661 [formerly ba04336262]
Former-commit-id: 68c89e6736
2013-08-15 15:25:02 -05:00
Bryan Kowal
d30c098382 Issue #2163 - 64-bit RHEL6 rpm conversion
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries


Former-commit-id: 35478ce5ff [formerly b32922186d] [formerly 0bee225031] [formerly e686f9bdda [formerly 0bee225031 [formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]]
Former-commit-id: e686f9bdda
Former-commit-id: d66458a6e3e011df4ee392929eae99b13093533d [formerly e24b249d5b]
Former-commit-id: 8d4645a0a4
2013-08-15 15:24:48 -05:00
Bryan Kowal
5185e79785 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: 61b14897fd [formerly 2b4faafed7] [formerly e3e596eb5d] [formerly be011d3b92 [formerly e3e596eb5d [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]]
Former-commit-id: be011d3b92
Former-commit-id: 475cbcc55e42aa6fa76623a7fa80a66662613073 [formerly 7b1615ba80]
Former-commit-id: 6561efe457
2013-08-15 15:24:11 -05:00
Steve Harris
aba7f09b15 Merge branch 'omaha_13.5.1' (13.5.1-16) into development
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	nativeLib/edex_com/.cproject

Former-commit-id: 56416708fc [formerly 3f8cc1daf3] [formerly 8484f03bb8] [formerly 891f00d650 [formerly 8484f03bb8 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]
Former-commit-id: 891f00d650
Former-commit-id: 39e71fd5cc358e2f7e3567f0928d250b71241a87 [formerly 44251fd949]
Former-commit-id: 2681f1f045
2013-08-15 12:50:08 -05:00
Richard Peter
84bef1f2ec Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]
Former-commit-id: c0b0eef331
2013-08-14 15:23:18 -05:00
Bryan Kowal
f2b5128ede Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function

Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3

Former-commit-id: 67c9cbf70e [formerly ec0ef7fe80] [formerly fc8c3f540d] [formerly 21893102bb [formerly fc8c3f540d [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]
Former-commit-id: 21893102bb
Former-commit-id: 45802081a28e7bb32c87dfb2c52082cf8ae519fb [formerly c2c9d745af]
Former-commit-id: e76b46487c
2013-08-14 11:21:33 -05:00
Bryan Kowal
ac9f30c364 Issue #2164 - fix 13.6.1 build
Former-commit-id: 17c4406504 [formerly dbaa6da3ea] [formerly 4604653241] [formerly 586b7646f0 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]
Former-commit-id: 586b7646f0
Former-commit-id: 35049ac07bfb3bc55f39b499e9526b76e59c3cf0 [formerly 8b3827c745]
Former-commit-id: d96ca6737c
2013-08-13 11:13:52 -05:00
Greg Armendariz
076a0b08ac 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]
Former-commit-id: 9f2f62427b
2013-08-08 17:00:36 -04:00
Greg Armendariz
6ddd51b399 Merge "Issue #2213 - create the primary and backup exportgrids directories for GFESuite" into development
Former-commit-id: ce959fa0bb [formerly 5d312802d3] [formerly 6fc06bb4e4] [formerly f6f9b823d8 [formerly 6fc06bb4e4 [formerly 86902fe016dd65446e74c405a93ba0142affc9a4]]]
Former-commit-id: f6f9b823d8
Former-commit-id: 85a0802f8cfe8e28f9d7016efb1815fe998a3e93 [formerly 8afd882a55]
Former-commit-id: 0d137cd803
2013-08-01 13:29:26 -05:00
Steve Harris
7fc384a659 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]
Former-commit-id: c7e7c838aa
2013-08-01 09:20:23 -04:00
Richard Peter
7f46fbf78f Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]
Former-commit-id: f97a27796d
Former-commit-id: ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]
Former-commit-id: a67f0bf2da
2013-07-31 12:54:12 -05:00
Bryan Kowal
5f6998ef39 Issue #2164 - re-enable the build of awips2-notification
Former-commit-id: 367905865a [formerly a04b44aee8] [formerly 2ce33f335a] [formerly 894aeda688 [formerly 2ce33f335a [formerly 0c8b0a5d178b798b788a602b4053a864fa2f2286]]]
Former-commit-id: 894aeda688
Former-commit-id: 4aece8aaf272cb9ed69af798ef1f86fb8dfe8e91 [formerly 96f0a6fb87]
Former-commit-id: b77b97d083
2013-07-30 13:04:54 -05:00
Bryan Kowal
9fdd988b85 Issue #2213 - create the primary and backup exportgrids directories for GFESuite
- Amend: no longer create the exportgrids tmp directory

Change-Id: Id8aba47244c21d2d7e114ac1af6a29b9a8cd7059

Former-commit-id: a3e73ad812 [formerly 844c7d14dd] [formerly f5eac74b94] [formerly 19a25a6222 [formerly f5eac74b94 [formerly 33229fe48556e43fefc8d14c223c0c9ed31ca1b9]]]
Former-commit-id: 19a25a6222
Former-commit-id: 543c0864aaf5eb4e6a2e07ea8f30b7fd61c7adfc [formerly a0bdbde908]
Former-commit-id: 18163d4729
2013-07-29 17:57:31 -05:00
Steve Harris
340e7bab60 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
2013-07-26 09:02:34 -04:00
Bryan Kowal
d9c8a62bbd Issue #2164 - disable build of awips2-notification temporarily.
Former-commit-id: 631fa7e5bf [formerly bedb6e5b55] [formerly 9ae7f63e26] [formerly cccb37ebc0 [formerly 9ae7f63e26 [formerly 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4]]]
Former-commit-id: cccb37ebc0
Former-commit-id: faee5296a8e05ac1bd6012bc5025005b71e77423 [formerly 779c2ea7a2]
Former-commit-id: 693a72ad6a
2013-07-24 12:45:29 -05:00
Greg Armendariz
15bdc4f6c4 Issue #2214 - Correct syntax
Former-commit-id: bd9c893494 [formerly eb6fef00c7] [formerly 2ea8c6cd5d8241cebf9f8690a338942596613dd4 [formerly 62751f2af8]] [formerly df8dd8d71b [formerly 62751f2af8 [formerly 0b398665c539949a624b9d2e3e0b11dcd501044d]]]
Former-commit-id: df8dd8d71b
Former-commit-id: a612dab10b72b7853b3b68864ce38d4b1f9c19bc [formerly 6f0c139522]
Former-commit-id: d8b26bf14f
2013-07-23 09:08:53 -05:00
Bryan Kowal
0056d3fd53 Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 38ef1633d2 [formerly 7e0a51e3b2] [formerly bdcbf39a9a] [formerly 7dcbe438e9 [formerly bdcbf39a9a [formerly e6bc04f738a19c56563e81d1924969640223f843]]]
Former-commit-id: 7dcbe438e9
Former-commit-id: 51ed507e7af85ecf40d3340950202abafe787a1a [formerly 1729820501]
Former-commit-id: d393264d27
2013-07-22 16:37:42 -05:00
Richard Peter
4c53471f8e Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]
Former-commit-id: e7ec068c7e
2013-07-22 09:40:18 -05:00
Steve Harris
0fe8173b7b 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
2013-07-18 12:07:22 -04:00
Bryan Kowal
50a292b30e Issue #2164 - fix 13.6.1 build
Former-commit-id: 064ca2fcf9 [formerly 9e83dace0b] [formerly df29ab238d] [formerly 1e8cd0b65e [formerly df29ab238d [formerly a3eb33bc1e71a6930f17c63a09c924289d9d84ed]]]
Former-commit-id: 1e8cd0b65e
Former-commit-id: a1413195b59ed5a8e2327ae264ec7b56959084a8 [formerly 030835264c]
Former-commit-id: a122743a1f
2013-07-15 11:33:10 -05:00
Greg Armendariz
f23d42e977 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]
Former-commit-id: 93b71934c0
2013-07-10 10:04:22 -04:00
Bryan Kowal
ae8c2c45d7 Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: bb72b77398 [formerly 32c997aa00] [formerly 8dbd4df057b224e7dbada77a07f8bdad9e5560f6 [formerly c91e636399]] [formerly 86c27863fe [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]]
Former-commit-id: 86c27863fe
Former-commit-id: b33bf6be199d74747fbece34684c1b542a99bd8a [formerly 594835f311]
Former-commit-id: 37504822a2
2013-07-08 10:43:14 -05:00
Bryan Kowal
3c0cb232c2 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848]
Former-commit-id: 56c7afbc0f
2013-07-03 15:55:53 -05:00
Greg Armendariz
d5bea0fc06 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]
Former-commit-id: d899faec3d
2013-07-03 12:20:27 -04:00
Richard Peter
5bcfa6048d Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f]
Former-commit-id: f8213c16bd
2013-07-01 00:04:43 -05:00
Richard Peter
0da7509e6d Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]
Former-commit-id: 69f8807963
2013-06-30 23:46:32 -05:00
Steve Harris
43bb696901 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
2013-06-28 09:46:25 -04:00
Roger Ferrel
4b10182a2e Issue #1966 Initial Base configuration files for Dale Morris to test.
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c]
Former-commit-id: 318de198e5
2013-06-25 13:44:30 -05:00
Richard Peter
bf6e4c1f71 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]
Former-commit-id: e03283ad4a
2013-06-24 18:51:56 -05:00
Richard Peter
46ee2f5dd7 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]
Former-commit-id: be094a1745
2013-06-24 18:36:15 -05:00
Steve Harris
e1a5587dd0 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]
Former-commit-id: deebdb874a
2013-06-24 09:29:43 -04:00
Steve Harris
db134ca485 Merge branch 'omaha_13.5.1' into development
Former-commit-id: 61427728fe [formerly 0166f071d6] [formerly 1e5ef65d03] [formerly cb95c711fd [formerly 1e5ef65d03 [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]]
Former-commit-id: cb95c711fd
Former-commit-id: 31d467e7a6f99e0bba292d2416450a09c0745a20 [formerly 33bbec83ea]
Former-commit-id: cf11c28c9f
2013-06-18 09:04:11 -05:00
Bryan Kowal
f842640027 Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
Former-commit-id: cb6073c9b1 [formerly 7739797147] [formerly cddb77b77b] [formerly 6d58e92913 [formerly cddb77b77b [formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]]
Former-commit-id: 6d58e92913
Former-commit-id: b65959681050b87644d70259b84677f21ae907a1 [formerly 8f6b0fef1a]
Former-commit-id: 5bb6ea92a7
2013-06-17 15:46:23 -05:00
Steve Harris
324532d6ac Merge branch 'omaha_13.5.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]
Former-commit-id: 251b3c1a9e
2013-06-17 15:29:01 -05:00
Steve Harris
0f83e19dab 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]
Former-commit-id: ccd66c0724
2013-06-17 15:01:22 -04:00
Bryan Kowal
ddb583d40c Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
Former-commit-id: 9c21691383 [formerly 09e13b5413] [formerly 609c635703] [formerly 772460c8ae [formerly 609c635703 [formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]]
Former-commit-id: 772460c8ae
Former-commit-id: d925a95b4bc5f82d0d8f734d61d611daf38ff961 [formerly b94fa4b001]
Former-commit-id: 12f7039875
2013-06-14 08:05:03 -05:00
Bryan Kowal
9b357701e0 Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database
Former-commit-id: 50014d3504 [formerly cb325941aa] [formerly 7ef3040d7a] [formerly e31e16741c [formerly 7ef3040d7a [formerly 1187c6a5220952a7cd8a10361ff344b3d7a65a47]]]
Former-commit-id: e31e16741c
Former-commit-id: c3fc9ca0faadda4ee234471daf38e7d044d3f6a9 [formerly fc25b8179f]
Former-commit-id: 66ea07f06d
2013-06-13 14:22:47 -05:00
Bryan Kowal
493a8edd2a Issue #1924 - add spring extensions to awips2-groovy
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: cf4ffaab21 [formerly 8198a78352] [formerly 180e01cf4c] [formerly dbe58fa63d [formerly 180e01cf4c [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]]
Former-commit-id: dbe58fa63d
Former-commit-id: 6087296d3ff5f4f2c0979e80d55a74fade6100df [formerly 44740b014b]
Former-commit-id: a67872d4fc
2013-06-13 11:18:23 -05:00
Steve Harris
43b7a9b410 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00