Steve Harris
0e9919f6be
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: 3e69490ab227c418812f1a999fee5ac18b96dc4c1a999fee5ac18b96dc4c245afb28c8ea27f9cd17
2013-03-18 16:43:22 -05:00
Steve Harris
2fd4ac9397
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940bc9df0a8f9f97d78994bc15b3ffe20f97d78994bc15b3ffe205f492500ea81a3f29afc
2013-03-18 15:43:32 -05:00
Dave Hladky
68114535f2
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5765be278bb38b952a2205dc454c7ef38b952a2205dc454c7ef160e1594b89e97fc9efe
2013-03-13 13:56:33 -05:00
Steve Harris
45a2d0501d
13.3.1-7 baseline
...
Former-commit-id: 23faf8445597d2f521e4a72254cc75e12ed113aea72254cc75e12ed113ae31c0a97dcaed5f1dbab6
2013-03-13 09:50:28 -05:00
Steve Harris
f92bc8f3d4
13.3.1-6.1 baseline
...
Former-commit-id: 3ea50babf56d96471b9bfa9d260c2ba062803c8cfa9d260c2ba062803c8cbfa25f33302e1dbdc10d
2013-03-13 08:28:26 -05:00
Dave Hladky
eefd544e4b
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: e17f8e05115c65862b8fa1006667e04b08491880a1006667e04b084918806ea95002de155903d135
2013-03-12 15:48:34 -05:00
Steve Harris
0cec06c171
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d62e110bd1513a4c7931e1566b677d093a4c7931e1566b677d094ed21b702b6fe4b16924
2013-03-12 08:35:45 -05:00
Steve Harris
7ff64bf8cc
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c168961a19a460b305dd7296957f42761d7305dd7296957f42761d7a8e1557c62b423579e4a
2013-03-05 12:27:49 -06:00
Steve Harris
aabd5cd51f
13.3.1-5 baseline
...
Former-commit-id: e4a1c61ad58123d5ac45a89221c75be26f7eb151a89221c75be26f7eb151a40c9136fea240379588
2013-03-05 10:47:06 -06:00
Steve Harris
4bfbb518c0
13.3.1-4 baseline
...
Former-commit-id: 9066d511fed79303de138c0b90f2922edca909028c0b90f2922edca909025e55ded3a93e0614b43a
2013-03-05 10:39:59 -06:00
Steve Harris
f30d1cdf87
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 90b0bab1560a4564eb9767f090638f6ec9e7303567f090638f6ec9e730350051276ad1e46625f8f2
2013-02-25 15:58:48 -06:00
Bryan Kowal
ec53fa98cd
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 6f419ae22f4cd5453e0a7c62991edfd5c8b829417c62991edfd5c8b829415a5914c01053b9e69868
2013-02-22 09:28:37 -06:00
Steve Harris
7e48d3e684
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: abdc73315164744fdb19a0573644c42641d578e2a0573644c42641d578e233dd2589f14f155a183a
2013-02-21 15:41:39 -06:00
Bryan Kowal
6a47017449
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: 0d4a63efe4519ce2c0fba8fb04f41c803397c7c7a8fb04f41c803397c7c7450e8e7a4cb2a0a7c148
2013-02-21 13:55:28 -06:00
Steve Harris
db712e1fcf
13.3.1-1 baseline
...
Former-commit-id: e0406d31838ae397085e71e8990021d2a654625f71e8990021d2a654625f46d28be4a4e4435815c9
2013-02-20 16:19:40 -06:00
Steve Harris
bca88ba9c7
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: f1f5359a2fc2327ce33dea50a5db77d123c044c3ea50a5db77d123c044c31c08acab3881f1fb83a0
2013-02-19 12:22:00 -06:00
Steve Harris
435be40166
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: fcef63a7afb8720e185d1874b07ab46318348e3b1874b07ab46318348e3b4777c782e285fa1539ef
2013-02-18 09:52:22 -06:00
Steve Harris
6c16384c5c
Issue #1632 - new FOSS licenses added for Data Delivery plugins
...
Former-commit-id: 0e7cd27efc049c219f2b02ec634536b9ce5b8b3502ec634536b9ce5b8b353c3681420e7a9501de55
2013-02-18 09:39:31 -06:00
Steve Harris
db02d32440
13.2.1-8 baseline
...
Former-commit-id: d176ec1f3818da2e93d7f81b382c04053156f02ef81b382c04053156f02ec6d584758f8cffb55371
2013-02-18 09:09:41 -06:00
Richard Peter
928aa2cfcc
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: 1e07d66c7fbb317b1acf221a6e1ca1b774fadb60221a6e1ca1b774fadb60fa4dd004f92e02b222f2
2013-02-05 09:25:55 -06:00
Bryan Kowal
3d6d5e37b7
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: e839188ca1145cd06eae167861801509523f1e84167861801509523f1e84513bda11bcfe70d57c36
2013-02-04 12:31:23 -06:00
Brad Gonzales
3e4338339b
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: 7cef72a46035cc853c74f459554e335bc6dd5498f459554e335bc6dd5498f3ef3092938fc5c18ebd
2013-02-04 08:52:33 -06:00
Steve Harris
41b14f0fa2
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: f207d282bcc218786986658bea377bec56acde81658bea377bec56acde816383bf8ed273d9455c65
2013-01-31 10:19:14 -06:00
Steve Harris
c9bc690eca
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e6093b159ee655d297f70505ed0a7260402725730505ed0a726040272573513d49939f75f6e61e6f
2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae
13.2.1-3 baseline
...
Former-commit-id: b84acc06da283147571ff45120a1f47a739c6a5bf45120a1f47a739c6a5b3edfa1e0bedaca1c3e73
2013-01-29 15:52:43 -06:00
Bryan Kowal
a8d1496454
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: 792230a38ea960b342307116bb86effa511e980b7116bb86effa511e980baefeada9d6f4e7bead66
2013-01-29 09:51:54 -06:00
Bryan Kowal
f8e120a219
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: 7b4935a0efec584b4d4bff34587e9454697ff658ff34587e9454697ff6580cf405d8d945dd0b02ff
2013-01-28 11:21:24 -06:00
Steve Harris
0f4fcd0ba8
13.2.1-2 baseline
...
Former-commit-id: 74bfe9595c0006a2b6cb7a7f7c45cac3e4551dfa7a7f7c45cac3e4551dfa1153d80c5b251a9c0195
2013-01-25 09:07:12 -06:00
Steve Harris
d069467e81
13.2.1-3 baseline
...
Former-commit-id: 7d2e979c51a5a0da5c027435527b252b6ac028bd7435527b252b6ac028bdcc0fdef15c9d248cff7a
2013-01-23 11:24:17 -05:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccad47cc08ac79d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb48d1aa77329771dfae6bc63f9bcae09771dfae6bc63f9bcae0f6670806bf8ed6a53113
2013-01-23 11:13:03 -05:00
Bryan Kowal
a9c31457b8
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: 3a0114558b792c03d5f4b4964c0a199e33969536b4964c0a199e33969536b47d484e70bc757e5bc1
2013-01-18 12:44:37 -06:00
Roger Ferrel
96deac5f43
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: 863bdb4d52972db123241cd076671c1e492b81ff1cd076671c1e492b81fff10521f86186d51634dc
2013-01-16 16:53:29 -06:00
Richard Peter
d880361e06
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: 6e42fa32d3a966546e313fb7d96ec11dbb34523b3fb7d96ec11dbb34523b345dfd2ca979ef100838
2013-01-14 18:07:17 -06:00
Steve Harris
3d35fd52d5
13.2.1-1 baseline
...
Former-commit-id: 8dd688c8785dfe4d10f1e62172c8c781849e3cbbe62172c8c781849e3cbb8713dfc5cae34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
9da3b7e2dd
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: 4e1f66abb3ae3ea75cbf1318f53902b8e42dabc01318f53902b8e42dabc0aa9e16b038fa6247baf7
2013-01-14 17:38:38 -06:00
Steve Harris
13be9f8987
13.1.2-8 baseline
...
Former-commit-id: 5aaacf4eecb864fdc303e6217a17de06b8eb8db0e6217a17de06b8eb8db03caf592e837d0109a349
2013-01-11 16:19:07 -05:00
Richard Peter
177a54d19a
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b6a5a0d7d0980bf1d7a28
2013-01-09 17:55:05 -06:00
Bryan Kowal
0e985cf0f3
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: 199e202979ab8b346489c8a43edd9ed6b4cb65f4c8a43edd9ed6b4cb65f4146c43a6066d7f57c62a
2013-01-07 12:16:01 -06:00
Steve Harris
fe763963e9
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775addbcae57f5782a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb3941337c553cd4185ef5c
2013-01-06 14:32:24 -06:00
Bryan Kowal
9cea52c3bd
Issue #1373 - prevent file naming conflicts
...
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02
Former-commit-id: a4576aeb2394fe1c8f599079c2dd3f2c9e5d68fa9079c2dd3f2c9e5d68fa6580901b035aed64be97
2013-01-05 10:40:10 -06:00
Bryan Kowal
2cb595f8bb
Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
...
Former-commit-id: 09fe6a9c032d9e54ddf89062ed93d7e131b5bc729062ed93d7e131b5bc728a4bc85badce21e23e52
2013-01-04 12:50:37 -06:00
Richard Peter
38c6856d3c
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: f941605942af5b6162821c560f5013c1765f776c1c560f5013c1765f776c424cb12ef69f991104dd
2013-01-03 16:27:32 -06:00
Richard Peter
38ae6f7f0a
Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
...
Former-commit-id: 218b69a387314bcffd15c3e9f4047945f901c1b0c3e9f4047945f901c1b054778e7490a608ba1a88
2012-12-18 13:08:40 -06:00
Roger Ferrel
50d3a97bcc
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: ecec7603df8c4e70fa9a0c5d10e66a43fd607a300c5d10e66a43fd607a306d4946290f07fbeb2928
2012-12-18 09:00:46 -06:00
Bryan Kowal
f8df1139b2
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: efe8f338b0ef0b12813d8d1e29448a5e22c246578d1e29448a5e22c246576103e7c485976834171e
2012-12-17 15:27:43 -06:00
Bryan Kowal
10960c5d62
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: 8d50e956437fb4e993e6660a9b615ff39489c44c660a9b615ff39489c44cc44c4bd0618579adf932
2012-12-16 21:40:26 -06:00
Richard Peter
785b6c7bfe
Revert "Issue #1262:"
...
This reverts commit 333e7ab7d4bad53d1b7f949065210309702591142f31d21ac3c3da463f39a210f08acc0970259114a210f08acc80a95c53ba9d03a53fb59a7cfa2383f37f9484569a7cfa2383f37f94845648641ca26f2100b136a9
2012-12-16 20:37:21 -06:00
Bryan Kowal
333e7ab7d4
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: 2f31d21ac3c3da463f39a210f08acc0970259114a210f08acc09702591149490652103bad53d1b7f
2012-12-13 12:40:31 -06:00
