Commit graph

196 commits

Author SHA1 Message Date
Steve Harris
c18b96dc4c Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 5927ff20543395733d9302eba2e6772315730a80
2013-03-18 16:43:22 -05:00
Steve Harris
c15b3ffe20 13.3.1-8 baseline
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
2013-03-18 15:43:32 -05:00
Dave Hladky
5dc454c7ef Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753
2013-03-13 13:56:33 -05:00
Steve Harris
e12ed113ae 13.3.1-7 baseline
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
2013-03-13 09:50:28 -05:00
Steve Harris
a062803c8c 13.3.1-6.1 baseline
Former-commit-id: 0ad794c98700f44b15933de48224ed2a822fd78f
2013-03-13 08:28:26 -05:00
Dave Hladky
4b08491880 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: 71a04da8f5aa339146bb45cce71c7b295735f43f
2013-03-12 15:48:34 -05:00
Steve Harris
566b677d09 13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Steve Harris
57f42761d7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c
2013-03-05 12:27:49 -06:00
Steve Harris
e26f7eb151 13.3.1-5 baseline
Former-commit-id: 97fafc60d9327ab3ea3f72266113c8f5e122a275
2013-03-05 10:47:06 -06:00
Steve Harris
2edca90902 13.3.1-4 baseline
Former-commit-id: 572c500b0c67d72405bdf533c43c68b1955ae90e
2013-03-05 10:39:59 -06:00
Steve Harris
6ec9e73035 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 52683c1ffba08b80b0d1f2b619161e108ca598b8
2013-02-25 15:58:48 -06:00
Bryan Kowal
d5c8b82941 Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 4f07f09e39949f6323dac4688913e02672a17fd8
2013-02-22 09:28:37 -06:00
Steve Harris
2641d578e2 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: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Bryan Kowal
803397c7c7 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: a5d554c271b87fa6d6b264ebb677802b58ebb763
2013-02-21 13:55:28 -06:00
Steve Harris
d2a654625f 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
d123c044c3 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: 819f88fb8b26ec0a83164df82b31e9b824b49da8
2013-02-19 12:22:00 -06:00
Steve Harris
6318348e3b Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
Former-commit-id: c397745e9c36a88bf71d87b671f0a8c826e117ea
2013-02-18 09:52:22 -06:00
Steve Harris
b9ce5b8b35 Issue #1632 - new FOSS licenses added for Data Delivery plugins
Former-commit-id: 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a
2013-02-18 09:39:31 -06:00
Steve Harris
053156f02e 13.2.1-8 baseline
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
Richard Peter
b774fadb60 Merge "Issue #1576 - updated qpid 0.18 rpms" into development
Former-commit-id: 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e
2013-02-05 09:25:55 -06:00
Bryan Kowal
09523f1e84 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: c43c4268ba13e5758dfb4c504d57dead5ae89d63
2013-02-04 12:31:23 -06:00
Brad Gonzales
5bc6dd5498 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: a84415dcfc5dd1d330ef8022f496b2e2ee45c54d
2013-02-04 08:52:33 -06:00
Steve Harris
ec56acde81 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: 60b2fd0496097fb1086207cbb01779dbfea877a0
2013-01-31 10:19:14 -06:00
Steve Harris
6040272573 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: 70ddefcaed9acb5b220faf36693a91ab43a508e2
2013-01-29 15:57:21 -06:00
Steve Harris
7a739c6a5b 13.2.1-3 baseline
Former-commit-id: fc7291332a08966a746605aef725e1947ec9643c
2013-01-29 15:52:43 -06:00
Bryan Kowal
fa511e980b Issue #1537 - fixed the edex-environment build
Former-commit-id: 4b9bd72e929e36d5c949589d5cc4ed6648a069ac
2013-01-29 09:51:54 -06:00
Bryan Kowal
54697ff658 Issue #1503 - initial commit for build of Qpid 0.18 rpms
-created a qpid service script

Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3

Former-commit-id: ee5806c98eb57680403e4f7768f92af1faa75de4
2013-01-28 11:21:24 -06:00
Steve Harris
c3e4551dfa 13.2.1-2 baseline
Former-commit-id: b8762009cb6f3bfa17984c2dcce65d5a48c6a844
2013-01-25 09:07:12 -06:00
Steve Harris
2b6ac028bd 13.2.1-3 baseline
Former-commit-id: ba03739c3528638c5383528fd64674ae5af1ed64
2013-01-23 11:24:17 -05:00
Steve Harris
328c6dccad 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
c63f9bcae0 13.2.1-1 baseline
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
2013-01-23 11:13:03 -05:00
Bryan Kowal
9e33969536 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: c96d7532679555f3ccf8a0d7bc07866e63ac177f
2013-01-18 12:44:37 -06:00
Roger Ferrel
1e492b81ff 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: 7f70c2f65453db6bf3097ae8157511c38a36b136
2013-01-16 16:53:29 -06:00
Richard Peter
1dbb34523b 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: 1a07daa97b2000f31ea4fd98890a15477b85b5f3
2013-01-14 18:07:17 -06:00
Steve Harris
81849e3cbb 13.2.1-1 baseline
Former-commit-id: 30d12654dea302c2bb0546edcb3b7ddd04ddd046
2013-01-14 18:42:21 -05:00
Richard Peter
b8e42dabc0 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: 90066bd215f4c547dfd483cec7c415c1e6fccece
2013-01-14 17:38:38 -06:00
Steve Harris
06b8eb8db0 13.1.2-8 baseline
Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f
2013-01-11 16:19:07 -05:00
Richard Peter
328be6ac2b Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c
2013-01-09 17:55:05 -06:00
Bryan Kowal
d6b4cb65f4 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: b535a90fb25287945485c10b3c85749c11285171
2013-01-07 12:16:01 -06:00
Steve Harris
59969775ad 13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
4ba416aeb3 13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Bryan Kowal
2c9e5d68fa Issue #1373 - prevent file naming conflicts
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: b7c11d1a5d55908a9e60e29b68fa01bf924c1429
2013-01-05 10:40:10 -06:00
Bryan Kowal
e131b5bc72 Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
Former-commit-id: 96fe189b5af5fbf0424504cc0b27d44c1defc0c2
2013-01-04 12:50:37 -06:00
Richard Peter
c1765f776c Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: b58fed7cb8f04d26397eb9df2273be6588737035
2013-01-03 16:27:32 -06:00
Richard Peter
45f901c1b0 Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
Former-commit-id: da48ac436f44dcff85723dfd5befaee9101b6978
2012-12-18 13:08:40 -06:00
Roger Ferrel
43fd607a30 Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: c1567c66f77077f9411a04f349a17d368424db5f
2012-12-18 09:00:46 -06:00
Bryan Kowal
5e22c24657 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: 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6
2012-12-17 15:27:43 -06:00
Bryan Kowal
f39489c44c 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: 0c579409321e8be6ea9bf2c98c44769fcdf28dcc
2012-12-16 21:40:26 -06:00
Richard Peter
f37f948456 Revert "Issue #1262:"
This reverts commit 0970259114 [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]


Former-commit-id: a4e51a9f814ff0e004be46460b6d27a848cb2fe9
2012-12-16 20:37:21 -06:00
Bryan Kowal
0970259114 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: 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951
2012-12-13 12:40:31 -06:00