Steve Harris
afd934db35
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: aa0e9acefd
[formerly d5b80f9225
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: d5b80f9225
Former-commit-id: 6b13492420
2013-03-05 12:29:44 -06:00
Steve Harris
3ec20c1689
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 57f42761d7
[formerly 305dd72969
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
2013-03-05 12:27:49 -06:00
Steve Harris
e4a1c61ad5
13.3.1-5 baseline
...
Former-commit-id: e26f7eb151
[formerly a89221c75b
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
2013-03-05 10:47:06 -06:00
Steve Harris
9066d511fe
13.3.1-4 baseline
...
Former-commit-id: 2edca90902
[formerly 8c0b90f292
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
2013-03-05 10:39:59 -06:00
Bryan Kowal
b407a34461
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: 8b4dce1c3d
[formerly 3a8efd5edf
[formerly d466b647d0d810418a88c875f39e55d98d680aa1]]
Former-commit-id: 3a8efd5edf
Former-commit-id: d484acbca0
2013-03-04 17:58:04 -06:00
Bryan Kowal
18a778cb8c
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 86a1f16e37
[formerly 20d3c6bcaa
[formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]
Former-commit-id: 20d3c6bcaa
Former-commit-id: 9022c53d53
2013-03-01 11:49:09 -06:00
Bryan Kowal
875c17399a
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: 4faf8aefbe
[formerly d081a2afcd
[formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: d081a2afcd
Former-commit-id: f806c880d3
2013-02-28 18:09:25 -06:00
Bryan Kowal
37e9c0cb20
Issue #1638 - update CAVE rpm name generation
...
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f
Former-commit-id: 5eb888fb98
[formerly b8496877ff
[formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]
Former-commit-id: b8496877ff
Former-commit-id: a9123a2b84
2013-02-28 14:43:53 -06:00
Richard Peter
bcd6b4d82b
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: 84e1b2f999
[formerly 6c766ddd85
[formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]
Former-commit-id: 6c766ddd85
Former-commit-id: b354ebb862
2013-02-27 11:43:18 -06:00
Steve Harris
90b0bab156
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 6ec9e73035
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 67f090638f
Former-commit-id: 0a4564eb97
2013-02-25 15:58:48 -06:00
Bryan Kowal
6f419ae22f
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: d5c8b82941
[formerly 7c62991edf
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]
Former-commit-id: 7c62991edf
Former-commit-id: 4cd5453e0a
2013-02-22 09:28:37 -06:00
Steve Harris
abdc733151
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: 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
2013-02-21 15:41:39 -06:00
Bryan Kowal
0d4a63efe4
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: 803397c7c7
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: a8fb04f41c
Former-commit-id: 519ce2c0fb
2013-02-21 13:55:28 -06:00
Steve Harris
e0406d3183
13.3.1-1 baseline
...
Former-commit-id: d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
2013-02-20 16:19:40 -06:00
Steve Harris
f1f5359a2f
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: d123c044c3
[formerly ea50a5db77
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: ea50a5db77
Former-commit-id: c2327ce33d
2013-02-19 12:22:00 -06:00
Steve Harris
fcef63a7af
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: 6318348e3b
[formerly 1874b07ab4
[formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]
Former-commit-id: 1874b07ab4
Former-commit-id: b8720e185d
2013-02-18 09:52:22 -06:00
Steve Harris
0e7cd27efc
Issue #1632 - new FOSS licenses added for Data Delivery plugins
...
Former-commit-id: b9ce5b8b35
[formerly 02ec634536
[formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]
Former-commit-id: 02ec634536
Former-commit-id: 049c219f2b
2013-02-18 09:39:31 -06:00
Steve Harris
d176ec1f38
13.2.1-8 baseline
...
Former-commit-id: 053156f02e
[formerly f81b382c04
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: f81b382c04
Former-commit-id: 18da2e93d7
2013-02-18 09:09:41 -06:00
Bryan Kowal
815ad5b07d
Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm
...
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used
- source jars will no longer be included in the rpms
Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774
Former-commit-id: 917bc533d6
[formerly 612d4fca1f
[formerly 30086ab14cfaab149a689b84803ac906754ddd13]]
Former-commit-id: 612d4fca1f
Former-commit-id: 306842b297
2013-02-11 15:13:07 -06:00
Richard Peter
1e07d66c7f
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: b774fadb60
[formerly 221a6e1ca1
[formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]
Former-commit-id: 221a6e1ca1
Former-commit-id: bb317b1acf
2013-02-05 09:25:55 -06:00
Bryan Kowal
e839188ca1
Issue #1576 - updated qpid 0.18 rpms
...
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms
Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222
Former-commit-id: 09523f1e84
[formerly 1678618015
[formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]
Former-commit-id: 1678618015
Former-commit-id: 145cd06eae
2013-02-04 12:31:23 -06:00
Brad Gonzales
7cef72a460
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 5bc6dd5498
[formerly f459554e33
[formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: f459554e33
Former-commit-id: 35cc853c74
2013-02-04 08:52:33 -06:00
Steve Harris
f207d282bc
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: ec56acde81
[formerly 658bea377b
[formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: 658bea377b
Former-commit-id: c218786986
2013-01-31 10:19:14 -06:00
Steve Harris
e6093b159e
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: 6040272573
[formerly 0505ed0a72
[formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 0505ed0a72
Former-commit-id: e655d297f7
2013-01-29 15:57:21 -06:00
Steve Harris
b84acc06da
13.2.1-3 baseline
...
Former-commit-id: 7a739c6a5b
[formerly f45120a1f4
[formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: f45120a1f4
Former-commit-id: 283147571f
2013-01-29 15:52:43 -06:00
Bryan Kowal
792230a38e
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: fa511e980b
[formerly 7116bb86ef
[formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]
Former-commit-id: 7116bb86ef
Former-commit-id: a960b34230
2013-01-29 09:51:54 -06:00
Bryan Kowal
7b4935a0ef
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: 54697ff658
[formerly ff34587e94
[formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]
Former-commit-id: ff34587e94
Former-commit-id: ec584b4d4b
2013-01-28 11:21:24 -06:00
Steve Harris
74bfe9595c
13.2.1-2 baseline
...
Former-commit-id: c3e4551dfa
[formerly 7a7f7c45ca
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: 7a7f7c45ca
Former-commit-id: 0006a2b6cb
2013-01-25 09:07:12 -06:00
Steve Harris
7d2e979c51
13.2.1-3 baseline
...
Former-commit-id: 2b6ac028bd
[formerly 7435527b25
[formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 7435527b25
Former-commit-id: a5a0da5c02
2013-01-23 11:24:17 -05:00
Steve Harris
a4fa438a41
13.2.1-2 baseline
...
Former-commit-id: 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 83e9157df7
Former-commit-id: 33bc5fd816
2013-01-23 11:18:44 -05:00
Steve Harris
11b05eedeb
13.2.1-1 baseline
...
Former-commit-id: c63f9bcae0
[formerly 9771dfae6b
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: 9771dfae6b
Former-commit-id: 48d1aa7732
2013-01-23 11:13:03 -05:00
Bryan Kowal
3a0114558b
Issue #1490 - updated edex-environment
...
- actually include the modified files in the commit this time
- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot
Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d
Former-commit-id: 9e33969536
[formerly b4964c0a19
[formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]
Former-commit-id: b4964c0a19
Former-commit-id: 792c03d5f4
2013-01-18 12:44:37 -06:00
Roger Ferrel
863bdb4d52
Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
...
Changes based on code review and added listener to GridManager and unit test.
Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650
Former-commit-id: 1e492b81ff
[formerly 1cd076671c
[formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]
Former-commit-id: 1cd076671c
Former-commit-id: 972db12324
2013-01-16 16:53:29 -06:00
Richard Peter
6e42fa32d3
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1dbb34523b
[formerly 3fb7d96ec1
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 3fb7d96ec1
Former-commit-id: a966546e31
2013-01-14 18:07:17 -06:00
Steve Harris
8dd688c878
13.2.1-1 baseline
...
Former-commit-id: 81849e3cbb
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: e62172c8c7
Former-commit-id: 5dfe4d10f1
2013-01-14 18:42:21 -05:00
Richard Peter
4e1f66abb3
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: b8e42dabc0
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: 1318f53902
Former-commit-id: ae3ea75cbf
2013-01-14 17:38:38 -06:00
Steve Harris
5aaacf4eec
13.1.2-8 baseline
...
Former-commit-id: 06b8eb8db0
[formerly e6217a17de
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: e6217a17de
Former-commit-id: b864fdc303
2013-01-11 16:19:07 -05:00
Richard Peter
95f0508c29
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 328be6ac2b
[formerly 029ebaa63a
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 029ebaa63a
Former-commit-id: d0a6ba23e5
2013-01-09 17:55:05 -06:00
Bryan Kowal
199e202979
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: d6b4cb65f4
[formerly c8a43edd9e
[formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: c8a43edd9e
Former-commit-id: ab8b346489
2013-01-07 12:16:01 -06:00
Steve Harris
1d4d25b49b
13.1.2-6 baseline
...
Former-commit-id: 59969775ad
[formerly 8e5f9e0e6c
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031
13.1.2-2 baseline
...
Former-commit-id: 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
2013-01-06 14:32:24 -06:00
Bryan Kowal
a4576aeb23
Issue #1373 - prevent file naming conflicts
...
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02
Former-commit-id: 2c9e5d68fa
[formerly 9079c2dd3f
[formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]
Former-commit-id: 9079c2dd3f
Former-commit-id: 94fe1c8f59
2013-01-05 10:40:10 -06:00
Bryan Kowal
09fe6a9c03
Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
...
Former-commit-id: e131b5bc72
[formerly 9062ed93d7
[formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]
Former-commit-id: 9062ed93d7
Former-commit-id: 2d9e54ddf8
2013-01-04 12:50:37 -06:00
Richard Peter
f941605942
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: c1765f776c
[formerly 1c560f5013
[formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: 1c560f5013
Former-commit-id: af5b616282
2013-01-03 16:27:32 -06:00
Richard Peter
218b69a387
Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
...
Former-commit-id: 45f901c1b0
[formerly c3e9f40479
[formerly da48ac436f44dcff85723dfd5befaee9101b6978]]
Former-commit-id: c3e9f40479
Former-commit-id: 314bcffd15
2012-12-18 13:08:40 -06:00
Roger Ferrel
ecec7603df
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: 43fd607a30
[formerly 0c5d10e66a
[formerly c1567c66f77077f9411a04f349a17d368424db5f]]
Former-commit-id: 0c5d10e66a
Former-commit-id: 8c4e70fa9a
2012-12-18 09:00:46 -06:00
Bryan Kowal
efe8f338b0
Issue #1416 : added the python package shapely
...
- shapely and dependencies will now be built as part of the
32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
MSFT Windows environment
Former-commit-id: 5e22c24657
[formerly 8d1e29448a
[formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]
Former-commit-id: 8d1e29448a
Former-commit-id: ef0b12813d
2012-12-17 15:27:43 -06:00
Bryan Kowal
8d50e95643
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds
Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396
Former-commit-id: f39489c44c
[formerly 660a9b615f
[formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]
Former-commit-id: 660a9b615f
Former-commit-id: 7fb4e993e6
2012-12-16 21:40:26 -06:00
Richard Peter
80a95c53ba
Revert "Issue #1262:"
...
This reverts commit 2f31d21ac3
[formerly c3da463f39
] [formerly a210f08acc
] [formerly 0970259114
[formerly a210f08acc
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]
Former-commit-id: f37f948456
[formerly 9a7cfa2383
[formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]
Former-commit-id: 9a7cfa2383
Former-commit-id: 9d03a53fb5
2012-12-16 20:37:21 -06:00
Bryan Kowal
2f31d21ac3
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: 0970259114
[formerly a210f08acc
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]
Former-commit-id: a210f08acc
Former-commit-id: c3da463f39
2012-12-13 12:40:31 -06:00