Bryan Kowal
a3a009e375
Issue #1850 - the ebxml schema will now be created within the metadata database
...
Former-commit-id: 3d13334576d6e3d521268d63244b4e3d13334576d6e3d521268d63244b4e2dbd62e9ce8d63244b4e2dbd62e9ce55b84c59c6a57a457c79b31ade077094b01918433f9bcfe936
2013-04-02 10:49:46 -05:00
Steve Harris
6a3f6359d6
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 5ec1c01d3a736bb45741140765a43e5ec1c01d3a736bb45741140765a43e437a04011a140765a43e437a04011a47c7f66f2b7b27767d7e0b48e96314d0e61c59e8ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: d2d91959253b722f107674a47b9bd9d2d91959253b722f107674a47b9bd914c9de225974a47b9bd914c9de225912055591eaf85a1ab9aba6dd28cc820fee31b1a8e74f4ae39e
2013-04-01 12:15:04 -05:00
Steve Harris
fd3b082c54
13.3.1-17 baseline
...
Former-commit-id: 1b8e623c9bf28b85d42f7bf9966dcb1b8e623c9bf28b85d42f7bf9966dcba3fe998f8f7bf9966dcba3fe998f8fa6ff543f88ef413da5f74afa41d4e750becef97fa112803c98
2013-04-01 12:04:56 -05:00
Bryan Kowal
3ad26d1b99
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Former-commit-id: a9cdcfeb64d124f7a37f2819e8fe48a9cdcfeb64d124f7a37f2819e8fe48e3c39b9be62819e8fe48e3c39b9be60e463b7bc9fa5825b0c507a52630a7df6d81dfd98cd870d757
2013-03-28 16:00:27 -05:00
Bryan Kowal
7b230a9f04
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: d3a2525705203a3d5200da99727625d3a2525705203a3d5200da997276252da2b370dbda997276252da2b370dbcf87439189131e260337998fbe87699343dee116c29e1e5374
2013-03-28 09:48:27 -05:00
Steve Harris
f2a81e18e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 02f49bc2e4069ee8a7489a321b6ac802f49bc2e4069ee8a7489a321b6ac83073951b3d9a321b6ac83073951b3db7beed13a56e48567370a4bf236cc790ec2d3fbf53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
cdad316568
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: bb88c2133a979d6a5d8c2a0e399dc8bb88c2133a979d6a5d8c2a0e399dc8d997aeaee42a0e399dc8d997aeaee43f99eed860428ec8a472e67b16bb03f3a84e952e21332cb0b5
2013-03-27 18:21:05 -05:00
Steve Harris
43942dad11
13.3.1-14 baseline
...
Former-commit-id: f9b343048591a5e4578e9022c500cef9b343048591a5e4578e9022c500ce9fba973fd09022c500ce9fba973fd03cbf22bd96936e4adda22ca160caf08237fdadaaf59f1f02b0
2013-03-27 17:59:34 -05:00
Roger Ferrel
396cc261b2
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: df2a9d8f966a4bd66abc19074d3053df2a9d8f966a4bd66abc19074d305374389834de19074d305374389834dedea028c7fc7244b4d23c4c5aa321698cdcee0ec5d76cbc6e80
2013-03-26 14:47:48 -05:00
Steve Harris
56522d8cf5
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: 690f4517464e54025fcd5fcfaf4360690f4517464e54025fcd5fcfaf436065df96a4195fcfaf436065df96a4196e4b9a6f015bb29627dc346b97a39afdd07bd72c0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 8d1903034b85104939ace71c69c3838d1903034b85104939ace71c69c3839ff8a94193e71c69c3839ff8a94193072b1bf35e02147470dbb926ff60b3779adedea90d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5
13.3.1-13 baseline
...
Former-commit-id: 0f2ebb8f10792171756fc77a452f5a0f2ebb8f10792171756fc77a452f5ac65f3e68e5c77a452f5ac65f3e68e5b49c1b0fa84f2e9aec0d822d05a7097aa4f7b26525a851cccf
2013-03-26 12:43:07 -05:00
Bryan Kowal
e7229e6124
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 41f03aaf7d233f2c54bec3936dd50e41f03aaf7d233f2c54bec3936dd50e21fa510eaac3936dd50e21fa510eaa154bedca1df8fafc8d4adb39a45c8801d571a0882d5d41e214
2013-03-25 16:52:33 -05:00
Steve Harris
fd735b8ff8
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0be962822070be473728a6f374b35d0be962822070be473728aaaac0b51e50be473728aaaac0b51e5bb30a41300f80f98cee2bc439aee4ff1d156779a120fc26670
2013-03-25 13:27:13 -05:00
Richard Peter
e62f6880db
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: d6a8b05c22ead48007cb9fdeb37a48d6a8b05c22ead48007cb9fdeb37a484c3fcf3b679fdeb37a484c3fcf3b67fced329e1c4b386ccd1c704bc86cf51cb743c14a3a0627b5d1
2013-03-21 18:21:53 -05:00
Greg Armendariz
e4d51820e2
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 65d6bc8cd71e1aea8a406af1a22e5665d6bc8cd71e1aea8a406af1a22e5685113a66b66af1a22e5685113a66b68550ade3ba1884b6dce3ccabddace6559136f546f9d1bfbb48
2013-03-21 12:55:59 -05:00
Bryan Kowal
fc836cda4f
Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
...
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694
Former-commit-id: 2395ca0b3b574f6cf4ad4e37fa66272395ca0b3b574f6cf4ad4e37fa66275b15c6fcaa4e37fa66275b15c6fcaa95b9e9b75188b0c2e1208141f492116e9c94566c17c46599a4
2013-03-21 10:04:29 -05:00
Bryan Kowal
a9dd3bd622
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: 0ef2ee6e494d3731bf6dab135933da0ef2ee6e494d3731bf6dab135933da722d068105ab135933da722d068105854ae5b462ac0ef6e7b95ab931d15e5ca46505e00f5a5e71b7
2013-03-21 09:50:48 -05:00
Steve Harris
616cddf60c
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: b7994fb77b0055a3213de2496455b2b7994fb77b0055a3213de2496455b20379be06d2e2496455b20379be06d20a86e74ea58db98c2d714fc2bb7bbaa91fcf98a2961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98
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: ea052b14bba9ced3a7effa15f03e1bea052b14bba9ced3a7effa15f03e1bdc419068f0fa15f03e1bdc419068f02cbd2a1bc9f4e26fd94d31044eabd18065161896c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9
13.3.1-10 baseline
...
Former-commit-id: 76ea9120d857f4676b6c073687d9a976ea9120d857f4676b6c073687d9a97078eec1b1073687d9a97078eec1b1dbeb388d72e9f03288087c2e617d26f2cc967a4fe6ab10cc26
2013-03-20 15:53:01 -05:00
Bryan Kowal
bb8b9b69da
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: fa0f882050448518579acbe9b30266fa0f882050448518579acbe9b3026674b4bb0891cbe9b3026674b4bb0891c7403dffe26b8538f7f57628860bfecb78a6af53b05b21401f
2013-03-19 13:27:38 -05:00
Steve Harris
4c10c7a5be
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: b64fbe549a28ef804e1bb8f0635ad6b64fbe549a28ef804e1bb8f0635ad67fcf9f1cb2b8f0635ad67fcf9f1cb2027eda5dce2a26783ba7900b9aadde22bb7ecd33481cee4c74
2013-03-18 16:52:00 -05:00
Steve Harris
c1bb0c2749
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: 3e69490ab227c418812f1a999fee5a3e69490ab227c418812f1a999fee5ac18b96dc4c1a999fee5ac18b96dc4c0e9919f6beea27f9cd17245afb28c8fc6748cb3e9d4d1baefe
2013-03-18 16:43:22 -05:00
Bryan Kowal
33b56397a3
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: 4f808edba3a93dcff1b5b954bc17bf4f808edba3a93dcff1b5b954bc17bf7fd035256db954bc17bf7fd035256d9d8b41c8c73e8d5449fc66e2ed79ec56f2b3f0c281ebbd5a5b
2013-03-18 16:36:33 -05:00
Steve Harris
0b0c5e4bec
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940bc9df0a8f9f97d78994bdd30a5f940bc9df0a8f9f97d78994bc15b3ffe20f97d78994bc15b3ffe202fd4ac939781a3f29afc5f492500ea0c94cc97fb1c2dffd66d
2013-03-18 15:43:32 -05:00
Bryan Kowal
f1854dd760
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: 9e678feaf8db02ab18ed729bc9c4bb9e678feaf8db02ab18ed729bc9c4bb5e86ef080e729bc9c4bb5e86ef080e0b6a31d7caf6139755a558e035a0241e9054ce15ea0950d836
2013-03-13 14:44:05 -05:00
Dave Hladky
b111edeb8b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5765be278bb38b952a2207d2c1bc4d5765be278bb38b952a2205dc454c7ef38b952a2205dc454c7ef68114535f29e97fc9efe160e1594b8cb5ee4a7b8b85e19282b
2013-03-13 13:56:33 -05:00
Steve Harris
352658125b
13.3.1-7 baseline
...
Former-commit-id: 23faf8445597d2f521e4a72254cc7523faf8445597d2f521e4a72254cc75e12ed113aea72254cc75e12ed113ae45a2d0501ded5f1dbab631c0a97dca3084a860cd88b28c39c1
2013-03-13 09:50:28 -05:00
Steve Harris
3b10c0e0b7
13.3.1-6.1 baseline
...
Former-commit-id: 3ea50babf56d96471b9bfa9d260c2b3ea50babf56d96471b9bfa9d260c2ba062803c8cfa9d260c2ba062803c8cf92bc8f3d42e1dbdc10dbfa25f3330c038384685a5b96e0c3c
2013-03-13 08:28:26 -05:00
Steve Harris
072065191b
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: 4c4c79036c36261cb095753a5213ab4c4c79036c36261cb095753a5213ab0cd7e56e65753a5213ab0cd7e56e6547cde9bd09bca46a1354d5bcdb00155232592cfa346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4
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: e17f8e05115c65862b8fa1006667e0e17f8e05115c65862b8fa1006667e04b08491880a1006667e04b08491880eefd544e4b155903d1356ea95002de29ed641a13cdfbcc7136
2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d62e110bd1513a4c7931e14eef6862d62e110bd1513a4c7931e1566b677d093a4c7931e1566b677d090cec06c1716fe4b169244ed21b702bc6f379f59ac28f3aeb02
2013-03-12 08:35:45 -05:00
Steve Harris
b64731872c
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: afd934db356b13492420d5b80f9225afd934db356b13492420d5b80f9225aa0e9acefdd5b80f9225aa0e9acefd1709c34b8f4a0b8772ecb9563da8a846d0c9fcee2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c168961a19a460b305dd729693ec20c168961a19a460b305dd7296957f42761d7305dd7296957f42761d77ff64bf8ccb423579e4aa8e1557c62b630339eb7d842ed88a7
2013-03-05 12:27:49 -06:00
Steve Harris
f20c87110e
13.3.1-5 baseline
...
Former-commit-id: e4a1c61ad58123d5ac45a89221c75be4a1c61ad58123d5ac45a89221c75be26f7eb151a89221c75be26f7eb151aabd5cd51fa240379588a40c9136fe1f98e01c5779ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc
13.3.1-4 baseline
...
Former-commit-id: 9066d511fed79303de138c0b90f2929066d511fed79303de138c0b90f2922edca909028c0b90f2922edca909024bfbb518c03e0614b43a5e55ded3a90df35cc5ec153aadc1d7
2013-03-05 10:39:59 -06:00
Bryan Kowal
ebec988cac
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: b407a34461d484acbca03a8efd5edfb407a34461d484acbca03a8efd5edf8b4dce1c3d3a8efd5edf8b4dce1c3d553f9889350d9400b2eceba8ccc6cd420431029480cb164e61
2013-03-04 17:58:04 -06:00
Bryan Kowal
e23e2eeec2
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 18a778cb8c9022c53d5320d3c6bcaa18a778cb8c9022c53d5320d3c6bcaa86a1f16e3720d3c6bcaa86a1f16e370a93a4a25c5958c0a876ed6e1003ff0e2cad14b2d0eb95dbbe
2013-03-01 11:49:09 -06:00
Bryan Kowal
cfaaafbd5a
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: 875c17399af806c880d3d081a2afcd875c17399af806c880d3d081a2afcd4faf8aefbed081a2afcd4faf8aefbee005f18132c4709b1bfb497bf33892cb5a2677b94d50fec21f
2013-02-28 18:09:25 -06:00
Bryan Kowal
b8abcf8692
Issue #1638 - update CAVE rpm name generation
...
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f
Former-commit-id: 37e9c0cb20a9123a2b84b8496877ff37e9c0cb20a9123a2b84b8496877ff5eb888fb98b8496877ff5eb888fb986f57b06d52da0d99d22f22acca8f3d3c2210c80dbc668bc828
2013-02-28 14:43:53 -06:00
Richard Peter
0a5fc08b3e
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: bcd6b4d82bb354ebb8626c766ddd85bcd6b4d82bb354ebb8626c766ddd8584e1b2f9996c766ddd8584e1b2f999f3528bedea0f1c3dd2569fa37933e6eff76706944b22cf71f4
2013-02-27 11:43:18 -06:00
Steve Harris
9d9a17aa64
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 90b0bab1560a4564eb9767f090638f90b0bab1560a4564eb9767f090638f6ec9e7303567f090638f6ec9e73035f30d1cdf87e46625f8f20051276ad1140ae3191c9db68d0585
2013-02-25 15:58:48 -06:00
Bryan Kowal
18b7aaed49
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 6f419ae22f4cd5453e0a7c62991edf6f419ae22f4cd5453e0a7c62991edfd5c8b829417c62991edfd5c8b82941ec53fa98cd53b9e698685a5914c010fd17273cb2dd7eda15aa
2013-02-22 09:28:37 -06:00
Steve Harris
34d0f59592
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: abdc73315164744fdb19a0573644c4abdc73315164744fdb19a0573644c42641d578e2a0573644c42641d578e27e48d3e6844f155a183a33dd2589f1f3c3191a1cb5d9e75b95
2013-02-21 15:41:39 -06:00
Bryan Kowal
55b55a1255
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: 0d4a63efe4519ce2c0fba8fb04f41c0d4a63efe4519ce2c0fba8fb04f41c803397c7c7a8fb04f41c803397c7c76a47017449b2a0a7c148450e8e7a4c2a21f2624bb88a24574b
2013-02-21 13:55:28 -06:00
Steve Harris
fac2d20002
13.3.1-1 baseline
...
Former-commit-id: e0406d31838ae397085e71e8990021e0406d31838ae397085e71e8990021d2a654625f71e8990021d2a654625fdb712e1fcfe4435815c946d28be4a4b3b56830b08c828dbd75
2013-02-20 16:19:40 -06:00
Steve Harris
b7446ac966
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: f1f5359a2fc2327ce33dea50a5db77f1f5359a2fc2327ce33dea50a5db77d123c044c3ea50a5db77d123c044c3bca88ba9c781f1fb83a01c08acab385a33182da577a66598fe
2013-02-19 12:22:00 -06:00
Steve Harris
7cc8f5879d
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: fcef63a7afb8720e185d1874b07ab4fcef63a7afb8720e185d1874b07ab46318348e3b1874b07ab46318348e3b435be4016685fa1539ef4777c782e271edff51e2e4a430b3a9
2013-02-18 09:52:22 -06:00
