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

337 commits

Author SHA1 Message Date
Greg Armendariz
717b8071cd Issue #2214 - Correct syntax 
Former-commit-id: eb6fef00c7 [formerly 62751f2af8] [formerly eb6fef00c7 [formerly 62751f2af8] [formerly df8dd8d71b [formerly 0b398665c539949a624b9d2e3e0b11dcd501044d]]]
Former-commit-id: df8dd8d71b
Former-commit-id: d8b26bf14f [formerly 6f0c139522]
Former-commit-id: 3396444cea
 2013-07-23 09:08:53 -05:00
Bryan Kowal
a7f6f1633b Issue #2206 - relocate ATBL directory change to 13.5 
Former-commit-id: 7e0a51e3b2 [formerly bdcbf39a9a] [formerly 7e0a51e3b2 [formerly bdcbf39a9a] [formerly 7dcbe438e9 [formerly e6bc04f738a19c56563e81d1924969640223f843]]]
Former-commit-id: 7dcbe438e9
Former-commit-id: d393264d27 [formerly 1729820501]
Former-commit-id: dbec306afd
 2013-07-22 16:37:42 -05:00
Richard Peter
2a9cfe51af 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: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
 2013-07-22 09:40:18 -05:00
Steve Harris
513c089375 13.5.1-7 baseline 
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
 2013-07-18 12:07:22 -04:00
Bryan Kowal
8444164d1a Issue #2164 - fix 13.6.1 build 
Former-commit-id: 9e83dace0b [formerly df29ab238d] [formerly 9e83dace0b [formerly df29ab238d] [formerly 1e8cd0b65e [formerly a3eb33bc1e71a6930f17c63a09c924289d9d84ed]]]
Former-commit-id: 1e8cd0b65e
Former-commit-id: a122743a1f [formerly 030835264c]
Former-commit-id: 1a93ae1636
 2013-07-15 11:33:10 -05:00
Greg Armendariz
b601345c9f 13.5.1-6 baseline 
Former-commit-id: 5894853996 [formerly 7e09fa5a0b] [formerly 5894853996 [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0 [formerly 12a09f9aa7]
Former-commit-id: ec2637676d
 2013-07-10 10:04:22 -04:00
Bryan Kowal
d4f13dac41 Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j 
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: 32c997aa00 [formerly c91e636399] [formerly 32c997aa00 [formerly c91e636399] [formerly 86c27863fe [formerly 0d4ba397163e0a365178d5481e520011784104d9]]]
Former-commit-id: 86c27863fe
Former-commit-id: 37504822a2 [formerly 594835f311]
Former-commit-id: e8885bf9c8
 2013-07-08 10:43:14 -05:00
Bryan Kowal
f56e42195e 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: 1932480e2b [formerly f6412117e1] [formerly 1932480e2b [formerly f6412117e1] [formerly 38aa7723c6 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 56c7afbc0f [formerly 32190c8848]
Former-commit-id: 22c2eef5ee
 2013-07-03 15:55:53 -05:00
Greg Armendariz
13ac0b1062 13.5.1-5 baseline 
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
 2013-07-03 12:20:27 -04:00
Richard Peter
cca3d4c19b 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: edeb3e255b [formerly 162261c395] [formerly edeb3e255b [formerly 162261c395] [formerly 76bc31aa77 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: f8213c16bd [formerly d3017ca60f]
Former-commit-id: 3d6754337a
 2013-07-01 00:04:43 -05:00
Richard Peter
da3eb1e75c 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: da54766cc8 [formerly 53258be797] [formerly da54766cc8 [formerly 53258be797] [formerly 582f38bdd4 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 69f8807963 [formerly 1757da59ee]
Former-commit-id: 7ceb1bb9ab
 2013-06-30 23:46:32 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline 
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
 2013-06-28 09:46:25 -04:00
Roger Ferrel
3419cbaddd Issue #1966 Initial Base configuration files for Dale Morris to test. 
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 1e5d68fa1b [formerly 2cfff5c563] [formerly 1e5d68fa1b [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 318de198e5 [formerly ee52f0281c]
Former-commit-id: b681d07346
 2013-06-25 13:44:30 -05:00
Richard Peter
ed15c2edcc 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: ad353c34f9 [formerly d262c02612] [formerly ad353c34f9 [formerly d262c02612] [formerly b007d4a302 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e03283ad4a [formerly af1099b3fb]
Former-commit-id: 8f49eea08f
 2013-06-24 18:51:56 -05:00
Richard Peter
9acddf6eeb 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: 0fa3bf800d [formerly 744eb64856] [formerly 0fa3bf800d [formerly 744eb64856] [formerly 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: be094a1745 [formerly a7594f8c93]
Former-commit-id: 4b582fef50
 2013-06-24 18:36:15 -05:00
Steve Harris
50d4376af7 13.5.1-3 baseline 
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: deebdb874a [formerly 810388f00a]
Former-commit-id: 1e939939b5
 2013-06-24 09:29:43 -04:00
Steve Harris
e72ec1d8b6 Merge branch 'omaha_13.5.1' into development 
Former-commit-id: 0166f071d6 [formerly 1e5ef65d03] [formerly 0166f071d6 [formerly 1e5ef65d03] [formerly cb95c711fd [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]]
Former-commit-id: cb95c711fd
Former-commit-id: cf11c28c9f [formerly 33bbec83ea]
Former-commit-id: 5343517c55
 2013-06-18 09:04:11 -05:00
Bryan Kowal
6577b77663 Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm 
Former-commit-id: 7739797147 [formerly cddb77b77b] [formerly 7739797147 [formerly cddb77b77b] [formerly 6d58e92913 [formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]]
Former-commit-id: 6d58e92913
Former-commit-id: 5bb6ea92a7 [formerly 8f6b0fef1a]
Former-commit-id: fcaf57d316
 2013-06-17 15:46:23 -05:00
Steve Harris
01dee712d5 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: 12248cade1 [formerly 43316cbff9] [formerly 12248cade1 [formerly 43316cbff9] [formerly 532d41787b [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 251b3c1a9e [formerly cb3e34813f]
Former-commit-id: 316d2ec667
 2013-06-17 15:29:01 -05:00
Steve Harris
afc02d5731 13.5.1-2 baseline 
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ccd66c0724 [formerly 3926dc20f7]
Former-commit-id: 332a74c4de
 2013-06-17 15:01:22 -04:00
Bryan Kowal
79c3662bb7 Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine. 
Former-commit-id: 09e13b5413 [formerly 609c635703] [formerly 09e13b5413 [formerly 609c635703] [formerly 772460c8ae [formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]]
Former-commit-id: 772460c8ae
Former-commit-id: 12f7039875 [formerly b94fa4b001]
Former-commit-id: 9fa7363600
 2013-06-14 08:05:03 -05:00
Bryan Kowal
d28531c888 Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database 
Former-commit-id: cb325941aa [formerly 7ef3040d7a] [formerly cb325941aa [formerly 7ef3040d7a] [formerly e31e16741c [formerly 1187c6a5220952a7cd8a10361ff344b3d7a65a47]]]
Former-commit-id: e31e16741c
Former-commit-id: 66ea07f06d [formerly fc25b8179f]
Former-commit-id: 3ee84e116e
 2013-06-13 14:22:47 -05:00
Bryan Kowal
4d346ee4a1 Issue #1924 - add spring extensions to awips2-groovy 
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: 8198a78352 [formerly 180e01cf4c] [formerly 8198a78352 [formerly 180e01cf4c] [formerly dbe58fa63d [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]]
Former-commit-id: dbe58fa63d
Former-commit-id: a67872d4fc [formerly 44740b014b]
Former-commit-id: 1463a53721
 2013-06-13 11:18:23 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline 
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
 2013-06-10 15:17:17 -04:00
Steve Harris
18fdb31920 Merge branch 'omaha_13.4.1' into development 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: 64cf1aedb1 [formerly 571757b2a6] [formerly 64cf1aedb1 [formerly 571757b2a6] [formerly 2327205cb7 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: 8b78f538d3 [formerly 035d74b348]
Former-commit-id: abfd0b9ead
 2013-06-06 15:46:23 -05:00
Steve Harris
d46b0413fb 13.4.1-14 baseline 
Former-commit-id: be236eb722 [formerly c749e122eb] [formerly be236eb722 [formerly c749e122eb] [formerly 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: cebc1ddb63 [formerly dee685e3c7]
Former-commit-id: 8ec7524cbb
 2013-06-06 15:15:27 -04:00
Richard Peter
22f6319986 Merge branch 'omaha_13.4.1' (13.4.1-13) into development 
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: f13177a981 [formerly 192e5b9be8] [formerly f13177a981 [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 9c3fe01efa [formerly ae09db35ad]
Former-commit-id: 13f64a7da8
 2013-06-04 14:06:53 -05:00
Bryan Kowal
95a5349f85 Issue #1952 - remove the hydroapps dependency on awips2-edex-native. 
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56

Former-commit-id: 7a1c08bb13 [formerly 46c9ba7c7b] [formerly 7a1c08bb13 [formerly 46c9ba7c7b] [formerly 67cd73c655 [formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]]
Former-commit-id: 67cd73c655
Former-commit-id: 86b88922da [formerly f8e2a2f4f2]
Former-commit-id: 36aa500077
 2013-06-04 09:36:09 -05:00
Bryan Kowal
3c1968bb5d Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7 
- Amend: update 32-bit rpm build script

Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6

Former-commit-id: ba097c8a48 [formerly a78c84dcd7] [formerly ba097c8a48 [formerly a78c84dcd7] [formerly 203d886739 [formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]
Former-commit-id: 203d886739
Former-commit-id: e6da4debed [formerly f63c05e5cf]
Former-commit-id: c6f4a5455f
 2013-05-31 11:47:09 -05:00
Roger Ferrel
65c96bcaf4 Issue #2054 Minor changes to 2 grib patterns in the pqact template. 
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf

Former-commit-id: 3c4b351c75 [formerly 85b9d9dea9] [formerly 3c4b351c75 [formerly 85b9d9dea9] [formerly 2f2c553089 [formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]]
Former-commit-id: 2f2c553089
Former-commit-id: 13543ac79e [formerly 593055e6c2]
Former-commit-id: f2b4dd8aa1
 2013-05-30 14:34:54 -05:00
Steve Harris
176f4d392f 13.4.1-13 baseline 
Former-commit-id: e3b8086bd0 [formerly 87b9712009] [formerly e3b8086bd0 [formerly 87b9712009] [formerly de476791fb [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 418f8aef56 [formerly b58cf237bf]
Former-commit-id: c9155c1631
 2013-05-29 16:30:09 -04:00
Nate Jensen
121dd032bf Issue #1989 remove high memory mode, reorganize wrapper.conf 
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 7059967ae9 [formerly caf414bab0] [formerly 7059967ae9 [formerly caf414bab0] [formerly 148b20f57c [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 47d2bf99b9 [formerly 72ed3e21b3]
Former-commit-id: 1fe16c9553
 2013-05-29 12:06:15 -05:00
Bryan Kowal
27ad63100f Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui 
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8

Former-commit-id: 73dfc7a5e1 [formerly bfd08efaa9] [formerly 73dfc7a5e1 [formerly bfd08efaa9] [formerly 8061922b70 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]
Former-commit-id: 8061922b70
Former-commit-id: 1469cb15d6 [formerly 83c1e3127e]
Former-commit-id: f13a7f7ca5
 2013-05-22 22:34:45 -05:00
Steve Harris
61debd93bf Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 570128b986 [formerly 8496832064] [formerly 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 389eefd1f9 [formerly 0f9e0b343d]
Former-commit-id: c184d31779
 2013-05-22 16:13:08 -05:00
Steve Harris
6dbe80b1af Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: dce0dc3692 [formerly 097617fa26] [formerly dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 026674d0b2 [formerly 299690a202]
Former-commit-id: bd9b2e493e
 2013-05-22 16:10:04 -05:00
Steve Harris
71e13c4d4d 13.4.1-12 baseline 
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: b745b332ae [formerly bd4f93e859]
Former-commit-id: 0d9e71aee2
 2013-05-22 16:42:39 -04:00
Greg Armendariz
8c4a634c5a Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development 
Former-commit-id: fce1512b37 [formerly 20a9ad95e5] [formerly fce1512b37 [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]
Former-commit-id: eecbf2718a
Former-commit-id: cd96d6d2e6 [formerly 525cd5c751]
Former-commit-id: 065e9bd1f9
 2013-05-21 12:24:19 -05:00
Richard Peter
7966576f23 Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf]
Former-commit-id: 046de916fd
 2013-05-21 12:11:21 -05:00
Bryan Kowal
f1b7607385 Issue #1952 - remove duplicate filesystem hierarchy 
Former-commit-id: e9abe7185b [formerly 4b8868ca54] [formerly e9abe7185b [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 61a613b490 [formerly 62d21498a6]
Former-commit-id: 1052f6cd98
 2013-05-21 11:09:57 -05:00
Richard Peter
2a8115770f Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 4809b3c15b [formerly 73372622f7] [formerly 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 21b87e9ea7 [formerly 427f54a878]
Former-commit-id: 69e6ea4847
 2013-05-21 10:35:00 -05:00
Steve Harris
d9f967c811 13.4.1-11 baseline 
Former-commit-id: d6319a2ca6 [formerly 2edee36158] [formerly d6319a2ca6 [formerly 2edee36158] [formerly c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 4d88863515 [formerly 6df093ef48]
Former-commit-id: 2767fd893c
 2013-05-21 09:19:25 -04:00
Bryan Kowal
7425d2c695 Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java 
Former-commit-id: db9b06cc9d [formerly d8ce0f369c] [formerly db9b06cc9d [formerly d8ce0f369c] [formerly a070d28ecc [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: a52363e2df [formerly 7dd9b1e1c0]
Former-commit-id: bef3b4c74f
 2013-05-17 18:21:03 -05:00
Richard Peter
fb910196c0 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: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
 2013-05-17 10:33:18 -05:00
Bryan Kowal
bb0432ea77 Issue #1927 - handle common base until new build implementation 
Former-commit-id: 84c3c114a9 [formerly 63f57de31f] [formerly 84c3c114a9 [formerly 63f57de31f] [formerly 79816de308 [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]]
Former-commit-id: 79816de308
Former-commit-id: 5d21fa1fd7 [formerly 9ea4bab577]
Former-commit-id: 3f4e377f05
 2013-05-16 23:56:47 -05:00
Steve Harris
34145afafe Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: 87a31f9990 [formerly 16ba74496d] [formerly 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: b5d3ff1867 [formerly 26664e6615]
Former-commit-id: 4827d8f1d9
 2013-05-16 13:45:58 -05:00
Bryan Kowal
e0a1431c69 Issue #2006 - qpid is now compatible with the upgraded FOSS libraries. 
Former-commit-id: 17101171b6 [formerly 1e726506e0] [formerly 17101171b6 [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 3812567894 [formerly 37461e68dd]
Former-commit-id: d792059e3c
 2013-05-16 11:00:47 -05:00
Bryan Kowal
fc9f89b497 Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment 
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: 2149099abb [formerly 11c93f548e] [formerly 2149099abb [formerly 11c93f548e] [formerly 43ec909008 [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]
Former-commit-id: 43ec909008
Former-commit-id: c03d61587c [formerly 97cff7bf9c]
Former-commit-id: c00e145831
 2013-05-16 10:21:11 -05:00
Bryan Kowal
c7a9750841 Issue #1872 - merge 2002; do not include .gitignore files in the rpm 
Former-commit-id: c83d93b527 [formerly b0122e794e] [formerly c83d93b527 [formerly b0122e794e] [formerly 20fd227d99 [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]
Former-commit-id: 20fd227d99
Former-commit-id: 8cba03d5a5 [formerly 7ec8600dc1]
Former-commit-id: 1a63d07768
 2013-05-16 10:19:31 -05:00
Steve Harris
1730b6c41e 13.4.1-9 baseline 
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: 67a95d07d2 [formerly 0766ae20dd]
Former-commit-id: 3f87ea1a15
 2013-05-16 11:12:07 -04:00
Bryan Kowal
a6ba3a9ba2 Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment 
Former-commit-id: 07408178a8 [formerly 5811585229] [formerly 07408178a8 [formerly 5811585229] [formerly 41f4075e6f [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]
Former-commit-id: 41f4075e6f
Former-commit-id: edaa5339d7 [formerly aabc22cc2e]
Former-commit-id: e39c66a454
 2013-05-15 15:37:16 -05:00