Steve Harris
0bd1d5bdef
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 4e54025fcd5fcfaf43604e54025fcd5fcfaf436065df96a41965df96a4195bb29627dc346b97a39afdd07bd72c
2013-03-26 12:47:40 -05:00
Steve Harris
0d88cd619b
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 85104939ace71c69c38385104939ace71c69c3839ff8a941939ff8a9419302147470dbb926ff60b3779adedea9
2013-03-26 12:44:24 -05:00
Steve Harris
25a851cccf
13.3.1-13 baseline
...
Former-commit-id: 792171756fc77a452f5a792171756fc77a452f5ac65f3e68e5c65f3e68e54f2e9aec0d822d05a7097aa4f7b265
2013-03-26 12:43:07 -05:00
Bryan Kowal
2d5d41e214
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 233f2c54bec3936dd50e233f2c54bec3936dd50e21fa510eaa21fa510eaaf8fafc8d4adb39a45c8801d571a088
2013-03-25 16:52:33 -05:00
Steve Harris
120fc26670
13.3.1-12 baseline
...
Former-commit-id: be962822070be473728abe962822070be473728aaaac0b51e5aaac0b51e5f80f98cee2bc439aee4ff1d156779a
2013-03-25 13:27:13 -05:00
Richard Peter
3a0627b5d1
Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client
...
Merge local virtualHosts.xml back in with SLC change
Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b
Former-commit-id: ead48007cb9fdeb37a48ead48007cb9fdeb37a484c3fcf3b674c3fcf3b674b386ccd1c704bc86cf51cb743c14a
2013-03-21 18:21:53 -05:00
Greg Armendariz
f9d1bfbb48
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 1e1aea8a406af1a22e561e1aea8a406af1a22e5685113a66b685113a66b61884b6dce3ccabddace6559136f546
2013-03-21 12:55:59 -05:00
Bryan Kowal
17c46599a4
Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
...
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694
Former-commit-id: 574f6cf4ad4e37fa6627574f6cf4ad4e37fa66275b15c6fcaa5b15c6fcaa88b0c2e1208141f492116e9c94566c
2013-03-21 10:04:29 -05:00
Bryan Kowal
0f5a5e71b7
Issue #1663 - awips2-database will no longer install site-specific databases.
...
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
will be purged by the localization rpm once it is finished with them
Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6
Former-commit-id: 4d3731bf6dab135933da4d3731bf6dab135933da722d068105722d068105ac0ef6e7b95ab931d15e5ca46505e0
2013-03-21 09:50:48 -05:00
Steve Harris
961c0b56a7
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0055a3213de2496455b20055a3213de2496455b20379be06d20379be06d28db98c2d714fc2bb7bbaa91fcf98a2
2013-03-20 16:09:26 -05:00
Steve Harris
c129fed15e
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: a9ced3a7effa15f03e1ba9ced3a7effa15f03e1bdc419068f0dc419068f0f4e26fd94d31044eabd18065161896
2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26
13.3.1-10 baseline
...
Former-commit-id: 57f4676b6c073687d9a957f4676b6c073687d9a97078eec1b17078eec1b1e9f03288087c2e617d26f2cc967a4f
2013-03-20 15:53:01 -05:00
Bryan Kowal
b05b21401f
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: 448518579acbe9b30266448518579acbe9b3026674b4bb089174b4bb08916b8538f7f57628860bfecb78a6af53
2013-03-19 13:27:38 -05:00
Steve Harris
481cee4c74
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 28ef804e1bb8f0635ad628ef804e1bb8f0635ad67fcf9f1cb27fcf9f1cb22a26783ba7900b9aadde22bb7ecd33
2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe
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: 27c418812f1a999fee5a27c418812f1a999fee5ac18b96dc4cc18b96dc4cea27f9cd17245afb28c8fc6748cb3e
2013-03-18 16:43:22 -05:00
Bryan Kowal
81ebbd5a5b
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: a93dcff1b5b954bc17bfa93dcff1b5b954bc17bf7fd035256d7fd035256d3e8d5449fc66e2ed79ec56f2b3f0c2
2013-03-18 16:36:33 -05:00
Steve Harris
1c2dffd66d
13.3.1-8 baseline
...
Former-commit-id: bc9df0a8f9f97d78994bbc9df0a8f9f97d78994bc15b3ffe20c15b3ffe2081a3f29afc5f492500ea0c94cc97fb
2013-03-18 15:43:32 -05:00
Bryan Kowal
ea0950d836
Issue #1663 - PostgreSQL Upgrade
...
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
* geos 3.3.7
* postgis 2.0.2
* proj 4.8.0
* gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers
Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8
Former-commit-id: db02ab18ed729bc9c4bbdb02ab18ed729bc9c4bb5e86ef080e5e86ef080ef6139755a558e035a0241e9054ce15
2013-03-13 14:44:05 -05:00
Dave Hladky
b85e19282b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb38b952a220765be278bb38b952a2205dc454c7ef5dc454c7ef9e97fc9efe160e1594b8cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Steve Harris
88b28c39c1
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4a72254cc7597d2f521e4a72254cc75e12ed113aee12ed113aeed5f1dbab631c0a97dca3084a860cd
2013-03-13 09:50:28 -05:00
Steve Harris
a5b96e0c3c
13.3.1-6.1 baseline
...
Former-commit-id: 6d96471b9bfa9d260c2b6d96471b9bfa9d260c2ba062803c8ca062803c8c2e1dbdc10dbfa25f3330c038384685
2013-03-13 08:28:26 -05:00
Steve Harris
346b22b196
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 36261cb095753a5213ab36261cb095753a5213ab0cd7e56e650cd7e56e65bca46a1354d5bcdb00155232592cfa
2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136
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: 5c65862b8fa1006667e05c65862b8fa1006667e04b084918804b08491880155903d1356ea95002de29ed641a13
2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02
13.3.1-6 baseline
...
Former-commit-id: 2e110bd1513a4c7931e12e110bd1513a4c7931e1566b677d09566b677d096fe4b169244ed21b702bc6f379f59a
2013-03-12 08:35:45 -05:00
Steve Harris
2b489e4e40
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 6b13492420d5b80f92256b13492420d5b80f9225aa0e9acefdaa0e9acefd4a0b8772ecb9563da8a846d0c9fcee
2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b305dd7296961a19a460b305dd7296957f42761d757f42761d7b423579e4aa8e1557c62b630339eb7
2013-03-05 12:27:49 -06:00
Steve Harris
79ff805090
13.3.1-5 baseline
...
Former-commit-id: 8123d5ac45a89221c75b8123d5ac45a89221c75be26f7eb151e26f7eb151a240379588a40c9136fe1f98e01c57
2013-03-05 10:47:06 -06:00
Steve Harris
153aadc1d7
13.3.1-4 baseline
...
Former-commit-id: d79303de138c0b90f292d79303de138c0b90f2922edca909022edca909023e0614b43a5e55ded3a90df35cc5ec
2013-03-05 10:39:59 -06:00
Bryan Kowal
80cb164e61
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: d484acbca03a8efd5edfd484acbca03a8efd5edf8b4dce1c3d8b4dce1c3d0d9400b2eceba8ccc6cd4204310294
2013-03-04 17:58:04 -06:00
Bryan Kowal
d0eb95dbbe
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 9022c53d5320d3c6bcaa9022c53d5320d3c6bcaa86a1f16e3786a1f16e375958c0a876ed6e1003ff0e2cad14b2
2013-03-01 11:49:09 -06:00
Bryan Kowal
4d50fec21f
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: f806c880d3d081a2afcdf806c880d3d081a2afcd4faf8aefbe4faf8aefbec4709b1bfb497bf33892cb5a2677b9
2013-02-28 18:09:25 -06:00
Bryan Kowal
bc668bc828
Issue #1638 - update CAVE rpm name generation
...
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f
Former-commit-id: a9123a2b84b8496877ffa9123a2b84b8496877ff5eb888fb985eb888fb98da0d99d22f22acca8f3d3c2210c80d
2013-02-28 14:43:53 -06:00
Richard Peter
4b22cf71f4
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: b354ebb8626c766ddd85b354ebb8626c766ddd8584e1b2f99984e1b2f9990f1c3dd2569fa37933e6eff7670694
2013-02-27 11:43:18 -06:00
Steve Harris
9db68d0585
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb9767f090638f0a4564eb9767f090638f6ec9e730356ec9e73035e46625f8f20051276ad1140ae3191c
2013-02-25 15:58:48 -06:00
Bryan Kowal
dd7eda15aa
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 4cd5453e0a7c62991edf4cd5453e0a7c62991edfd5c8b82941d5c8b8294153b9e698685a5914c010fd17273cb2
2013-02-22 09:28:37 -06:00
Steve Harris
b5d9e75b95
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: 64744fdb19a0573644c464744fdb19a0573644c42641d578e22641d578e24f155a183a33dd2589f1f3c3191a1c
2013-02-21 15:41:39 -06:00
Bryan Kowal
b88a24574b
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: 519ce2c0fba8fb04f41c519ce2c0fba8fb04f41c803397c7c7803397c7c7b2a0a7c148450e8e7a4c2a21f2624b
2013-02-21 13:55:28 -06:00
Steve Harris
8c828dbd75
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e71e89900218ae397085e71e8990021d2a654625fd2a654625fe4435815c946d28be4a4b3b56830b0
2013-02-20 16:19:40 -06:00
Steve Harris
77a66598fe
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: c2327ce33dea50a5db77c2327ce33dea50a5db77d123c044c3d123c044c381f1fb83a01c08acab385a33182da5
2013-02-19 12:22:00 -06:00
Steve Harris
e4a430b3a9
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: b8720e185d1874b07ab4b8720e185d1874b07ab46318348e3b6318348e3b85fa1539ef4777c782e271edff51e2
2013-02-18 09:52:22 -06:00
Steve Harris
a488f3d978
Issue #1632 - new FOSS licenses added for Data Delivery plugins
...
Former-commit-id: 049c219f2b02ec634536049c219f2b02ec634536b9ce5b8b35b9ce5b8b357a9501de553c3681420edaba9ecc43
2013-02-18 09:39:31 -06:00
Steve Harris
32ad300b47
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7f81b382c0418da2e93d7f81b382c04053156f02e053156f02e8cffb55371c6d584758fedac913af7
2013-02-18 09:09:41 -06:00
Bryan Kowal
25802d7d2d
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: 306842b297612d4fca1f306842b297612d4fca1f917bc533d6917bc533d692e5f2df54d94543a01c7ceaba25df
2013-02-11 15:13:07 -06:00
Richard Peter
7fbd24e723
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: bb317b1acf221a6e1ca1bb317b1acf221a6e1ca1b774fadb60b774fadb602e02b222f2fa4dd004f9b4192e72c8
2013-02-05 09:25:55 -06:00
Bryan Kowal
c92b997909
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: 145cd06eae1678618015145cd06eae167861801509523f1e8409523f1e84fe70d57c36513bda11bc88d5830873
2013-02-04 12:31:23 -06:00
Brad Gonzales
7253bbf20e
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: 35cc853c74f459554e3335cc853c74f459554e335bc6dd54985bc6dd54988fc5c18ebdf3ef309293adbfa7ced1
2013-02-04 08:52:33 -06:00
Steve Harris
2107a54161
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: c218786986658bea377bc218786986658bea377bec56acde81ec56acde8173d9455c656383bf8ed2a74d58ce6f
2013-01-31 10:19:14 -06:00
Steve Harris
99bc358644
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e655d297f70505ed0a72e655d297f70505ed0a726040272573604027257375f6e61e6f513d49939fba97151132
2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb
13.2.1-3 baseline
...
Former-commit-id: 283147571ff45120a1f4283147571ff45120a1f47a739c6a5b7a739c6a5bdaca1c3e733edfa1e0bedbaf4a3e39
2013-01-29 15:52:43 -06:00
Bryan Kowal
1377ae600f
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: a960b342307116bb86efa960b342307116bb86effa511e980bfa511e980bf4e7bead66aefeada9d6662f471e5e
2013-01-29 09:51:54 -06:00
