Richard Peter
530b3bd588
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly 0c4ae068ad
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4
]
Former-commit-id: 60679a818a
2013-12-05 12:12:27 -06:00
Steve Harris
41a54a5ca6
14.1.1-11 baseline
...
Former-commit-id: 401ee156b8
[formerly 337b138200
] [formerly bcc2fb56db7acfd2f7ecd928f118488dc7beb36e [formerly 70a6f1936e
]] [formerly 71ae71c850
[formerly 70a6f1936e
[formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d
]
Former-commit-id: 8bd818de09
2013-12-02 17:10:10 -05:00
Steve Harris
2039d101ef
14.1.1-4 baseline
...
Former-commit-id: cb3b53f205
[formerly 82dec19b6a
] [formerly 20443a5d933e8268c1fb3f455df197a71fca1203 [formerly bd95bb6a4e
]] [formerly 99e3707c5b
[formerly bd95bb6a4e
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e
]
Former-commit-id: b60635cd70
2013-10-28 10:55:16 -04:00
Steve Harris
2d30611c6d
14.1.1-3 baseline
...
Former-commit-id: a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly 94f24e0d8a
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea
]
Former-commit-id: aa59400b67
2013-10-28 10:46:02 -04:00
Bryan Kowal
c5df92f4eb
Issue #2422 - fix 14.2.1 RHEL6 build
...
Former-commit-id: f092ee3d76
[formerly efd377f12f
] [formerly 61527c0b80
] [formerly 87087a5ea4
[formerly 61527c0b80
[formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]
Former-commit-id: 87087a5ea4
Former-commit-id: b91956819bff7666a317ceb10eb717ae268cbcff [formerly fe4e9ca3f8
]
Former-commit-id: af4b729522
2013-10-02 18:41:11 -05:00
Bryan Kowal
f7009e8d15
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 3b7573154c
[formerly bb5acf7c11
] [formerly c125b5b053
] [formerly 9829477ced
[formerly c125b5b053
[formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]
Former-commit-id: 9829477ced
Former-commit-id: c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912
]
Former-commit-id: 0f825df590
2013-09-30 18:00:31 -05:00
Bryan Kowal
77b339ea66
Issue #2382 - fix qpid amqp path
...
Former-commit-id: 4179f9f927
[formerly b84cb9106f
] [formerly b9f4e93687
] [formerly b002df8a06
[formerly b9f4e93687
[formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]]
Former-commit-id: b002df8a06
Former-commit-id: f786adcc134d577e9f93acb1482d9559bd497a3f [formerly 8ce22ec91a
]
Former-commit-id: eb6cc0320c
2013-09-17 17:51:43 -05:00
Steve Harris
a8201afb82
13.5.2-4 baseline
...
Former-commit-id: 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 58c6821427
[formerly e3c935d48b
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59
]
Former-commit-id: 4c6790f10f
2013-09-12 11:13:59 -04:00
Bryan Kowal
7b209d0c22
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
...
Former-commit-id: a58482866f
[formerly 6578b9a7de
] [formerly 1adf764747
] [formerly 79e88c19aa
[formerly 1adf764747
[formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]]
Former-commit-id: 79e88c19aa
Former-commit-id: 4410ae3e4d51d61cc16e04ba9bb3b7110221a5a9 [formerly aa8eb47b95
]
Former-commit-id: 2a35fb001d
2013-09-06 12:30:01 -05:00
Bryan Kowal
2fbf708d37
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
...
Former-commit-id: 2374999571
[formerly 41ab242c2d
] [formerly a02d910023
] [formerly 03cadc5aa9
[formerly a02d910023
[formerly 422e9b611535e9c20338041e0e1af62d38aab047]]]
Former-commit-id: 03cadc5aa9
Former-commit-id: a1835e61d037b5682286f5b833659d21414debeb [formerly 65bb1ec74b
]
Former-commit-id: 9c890422fa
2013-09-04 13:48:08 -05:00
Bryan Kowal
ece1f596c6
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: 861a887084
[formerly 17d652a8dd
] [formerly 9415560b38
] [formerly ab3485a3ed
[formerly 9415560b38
[formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]]
Former-commit-id: ab3485a3ed
Former-commit-id: dbc6b10841e1b6bd48ab2c5bb58813c728e5fbb6 [formerly 17b8ded082
]
Former-commit-id: 751f005228
2013-09-03 13:46:19 -05:00
Bryan Kowal
b1bf6e0a12
Issue #2279 - updated python qpid library
...
- python qpid is no longer compiled; so, the rpm is now noarch
Former-commit-id: 8fef58139c
[formerly d77dd5a22c
] [formerly 818c69fb39
] [formerly f2dd3ab85a
[formerly 818c69fb39
[formerly 8487a7abdc967f39f853919b5c274b354a674b2c]]]
Former-commit-id: f2dd3ab85a
Former-commit-id: b9c85eb335c2aff8b9e5423dcca60dd53d345f8c [formerly 981562faac
]
Former-commit-id: 572e1c0b33
2013-08-29 16:00:45 -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
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
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79
]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
6e0b2c55d7
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 04da0dbf50
[formerly 75901860c2
] [formerly c12ee14e66
] [formerly 1e02387ff1
[formerly c12ee14e66
[formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc
]
Former-commit-id: 772c60efa4
2012-10-08 13:26:20 -05: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
9f4fa7bf83
12.10.1-1 baseline
...
Former-commit-id: 7248f8b762
[formerly 0abf64b77c
] [formerly 195158c004
] [formerly d708932029
[formerly 195158c004
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7
]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
c704490769
12.9.1-10 baseline
...
Former-commit-id: 264d870cbf
[formerly bdb45cdfae
] [formerly 3adc50a783
] [formerly cb9b80f3a0
[formerly 3adc50a783
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a
]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -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
80655bf0a3
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b
]
Former-commit-id: d7d60cc623
2012-08-15 15:19:10 -05:00
Steve Harris
330df3323f
12.8.1-10 baseline
...
Former-commit-id: 79d4d91e46
[formerly 6244359a80
] [formerly b5e8fee24d
] [formerly ca25d508ec
[formerly b5e8fee24d
[formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340
]
Former-commit-id: 78d34d65d2
2012-08-06 09:34:26 -05:00
Steve Harris
4f47148ced
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c4
[formerly 2653ddc2e3
] [formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1
]
Former-commit-id: dab00b12e6
2012-08-01 10:45:37 -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
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
Bryan Kowal
f19cf1c4ee
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 48c7c3b950
[formerly 63f6f44fe1
] [formerly 43c3807a32
] [formerly 9d64e1df12
[formerly 43c3807a32
[formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]
Former-commit-id: 9d64e1df12
Former-commit-id: 9ceb347a77
[formerly 06187b93be
]
Former-commit-id: 281be5e0b7
2012-01-18 16:00:45 -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