Dave Hladky
9e97fc9efe
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb38b952a2205dc454c7ef5dc454c7ef160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4a72254cc75e12ed113aee12ed113ae31c0a97dca
2013-03-13 09:50:28 -05:00
Steve Harris
2e1dbdc10d
13.3.1-6.1 baseline
...
Former-commit-id: 6d96471b9bfa9d260c2ba062803c8ca062803c8cbfa25f3330
2013-03-13 08:28:26 -05:00
Dave Hladky
155903d135
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: 5c65862b8fa1006667e04b084918804b084918806ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
6fe4b16924
13.3.1-6 baseline
...
Former-commit-id: 2e110bd1513a4c7931e1566b677d09566b677d094ed21b702b
2013-03-12 08:35:45 -05:00
Steve Harris
b423579e4a
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b305dd7296957f42761d757f42761d7a8e1557c62
2013-03-05 12:27:49 -06:00
Steve Harris
a240379588
13.3.1-5 baseline
...
Former-commit-id: 8123d5ac45a89221c75be26f7eb151e26f7eb151a40c9136fe
2013-03-05 10:47:06 -06:00
Steve Harris
3e0614b43a
13.3.1-4 baseline
...
Former-commit-id: d79303de138c0b90f2922edca909022edca909025e55ded3a9
2013-03-05 10:39:59 -06:00
Steve Harris
e46625f8f2
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb9767f090638f6ec9e730356ec9e730350051276ad1
2013-02-25 15:58:48 -06:00
Bryan Kowal
53b9e69868
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 4cd5453e0a7c62991edfd5c8b82941d5c8b829415a5914c010
2013-02-22 09:28:37 -06:00
Steve Harris
4f155a183a
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: 64744fdb19a0573644c42641d578e22641d578e233dd2589f1
2013-02-21 15:41:39 -06:00
Bryan Kowal
b2a0a7c148
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: 519ce2c0fba8fb04f41c803397c7c7803397c7c7450e8e7a4c
2013-02-21 13:55:28 -06:00
Steve Harris
e4435815c9
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e71e8990021d2a654625fd2a654625f46d28be4a4
2013-02-20 16:19:40 -06:00
Steve Harris
81f1fb83a0
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: c2327ce33dea50a5db77d123c044c3d123c044c31c08acab38
2013-02-19 12:22:00 -06:00
Steve Harris
85fa1539ef
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: b8720e185d1874b07ab46318348e3b6318348e3b4777c782e2
2013-02-18 09:52:22 -06:00
Steve Harris
7a9501de55
Issue #1632 - new FOSS licenses added for Data Delivery plugins
...
Former-commit-id: 049c219f2b02ec634536b9ce5b8b35b9ce5b8b353c3681420e
2013-02-18 09:39:31 -06:00
Steve Harris
8cffb55371
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7f81b382c04053156f02e053156f02ec6d584758f
2013-02-18 09:09:41 -06:00
Richard Peter
2e02b222f2
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: bb317b1acf221a6e1ca1b774fadb60b774fadb60fa4dd004f9
2013-02-05 09:25:55 -06:00
Bryan Kowal
fe70d57c36
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: 145cd06eae167861801509523f1e8409523f1e84513bda11bc
2013-02-04 12:31:23 -06:00
Brad Gonzales
8fc5c18ebd
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: 35cc853c74f459554e335bc6dd54985bc6dd5498f3ef309293
2013-02-04 08:52:33 -06:00
Steve Harris
73d9455c65
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: c218786986658bea377bec56acde81ec56acde816383bf8ed2
2013-01-31 10:19:14 -06:00
Steve Harris
75f6e61e6f
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e655d297f70505ed0a7260402725736040272573513d49939f
2013-01-29 15:57:21 -06:00
Steve Harris
daca1c3e73
13.2.1-3 baseline
...
Former-commit-id: 283147571ff45120a1f47a739c6a5b7a739c6a5b3edfa1e0be
2013-01-29 15:52:43 -06:00
Bryan Kowal
f4e7bead66
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: a960b342307116bb86effa511e980bfa511e980baefeada9d6
2013-01-29 09:51:54 -06:00
Bryan Kowal
45dd0b02ff
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: ec584b4d4bff34587e9454697ff65854697ff6580cf405d8d9
2013-01-28 11:21:24 -06:00
Steve Harris
251a9c0195
13.2.1-2 baseline
...
Former-commit-id: 0006a2b6cb7a7f7c45cac3e4551dfac3e4551dfa1153d80c5b
2013-01-25 09:07:12 -06:00
Steve Harris
9d248cff7a
13.2.1-3 baseline
...
Former-commit-id: a5a0da5c027435527b252b6ac028bd2b6ac028bdcc0fdef15c
2013-01-23 11:24:17 -05:00
Steve Harris
d9be4dce21
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd81683e9157df7328c6dccad328c6dccad47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
8ed6a53113
13.2.1-1 baseline
...
Former-commit-id: 48d1aa77329771dfae6bc63f9bcae0c63f9bcae0f6670806bf
2013-01-23 11:13:03 -05:00
Bryan Kowal
bc757e5bc1
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: 792c03d5f4b4964c0a199e339695369e33969536b47d484e70
2013-01-18 12:44:37 -06:00
Roger Ferrel
86d51634dc
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: 972db123241cd076671c1e492b81ff1e492b81fff10521f861
2013-01-16 16:53:29 -06:00
Richard Peter
79ef100838
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: a966546e313fb7d96ec11dbb34523b1dbb34523b345dfd2ca9
2013-01-14 18:07:17 -06:00
Steve Harris
e34695538d
13.2.1-1 baseline
...
Former-commit-id: 5dfe4d10f1e62172c8c781849e3cbb81849e3cbb8713dfc5ca
2013-01-14 18:42:21 -05:00
Richard Peter
fa6247baf7
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: ae3ea75cbf1318f53902b8e42dabc0b8e42dabc0aa9e16b038
2013-01-14 17:38:38 -06:00
Steve Harris
7d0109a349
13.1.2-8 baseline
...
Former-commit-id: b864fdc303e6217a17de06b8eb8db006b8eb8db03caf592e83
2013-01-11 16:19:07 -05:00
Richard Peter
80bf1d7a28
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: d0a6ba23e5029ebaa63a328be6ac2b328be6ac2b6a5a0d7d09
2013-01-09 17:55:05 -06:00
Bryan Kowal
6d7f57c62a
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: ab8b346489c8a43edd9ed6b4cb65f4d6b4cb65f4146c43a606
2013-01-07 12:16:01 -06:00
Steve Harris
82a1ed77a4
13.1.2-6 baseline
...
Former-commit-id: efd3392abe8e5f9e0e6c59969775ad59969775addbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c
13.1.2-2 baseline
...
Former-commit-id: 51208e5515c0c1d56f3a4ba416aeb34ba416aeb3941337c553
2013-01-06 14:32:24 -06:00
Bryan Kowal
5aed64be97
Issue #1373 - prevent file naming conflicts
...
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02
Former-commit-id: 94fe1c8f599079c2dd3f2c9e5d68fa2c9e5d68fa6580901b03
2013-01-05 10:40:10 -06:00
Bryan Kowal
ce21e23e52
Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
...
Former-commit-id: 2d9e54ddf89062ed93d7e131b5bc72e131b5bc728a4bc85bad
2013-01-04 12:50:37 -06:00
Richard Peter
9f991104dd
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: af5b6162821c560f5013c1765f776cc1765f776c424cb12ef6
2013-01-03 16:27:32 -06:00
Richard Peter
a608ba1a88
Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
...
Former-commit-id: 314bcffd15c3e9f4047945f901c1b045f901c1b054778e7490
2012-12-18 13:08:40 -06:00
Roger Ferrel
07fbeb2928
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: 8c4e70fa9a0c5d10e66a43fd607a3043fd607a306d4946290f
2012-12-18 09:00:46 -06:00
Bryan Kowal
976834171e
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: ef0b12813d8d1e29448a5e22c246575e22c246576103e7c485
2012-12-17 15:27:43 -06:00
Bryan Kowal
8579adf932
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: 7fb4e993e6660a9b615ff39489c44cf39489c44cc44c4bd061
2012-12-16 21:40:26 -06:00
Richard Peter
2100b136a9
Revert "Issue #1262:"
...
This reverts commit bad53d1b7f94906521030970259114c3da463f39a210f08acc09702591149d03a53fb59a7cfa2383f37f948456f37f94845648641ca26f
2012-12-16 20:37:21 -06:00
Bryan Kowal
bad53d1b7f
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: c3da463f39a210f08acc097025911409702591149490652103
2012-12-13 12:40:31 -06:00
Roger Ferrel
662d51cda1
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: 6929a73900b677a5ba3daefa650cdaaefa650cdaf64a99d554
2012-12-11 15:43:54 -06:00
Steve Harris
f02c1ef71d
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: 4d4771ee3a43ddfe98c4f6988eeffff6988eefff6287b32e7d
2012-12-11 08:45:53 -06:00
