Steve Harris
|
5b36559525
|
12.8.1-10 baseline
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]]
Former-commit-id: ca25d508ec
Former-commit-id: 330df3323f [formerly 78d34d65d2] [formerly ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]]
Former-commit-id: ec8b3d9f8a4ff2a546518a3c5769751ec3bf2a2f [formerly 46daa48f1c]
Former-commit-id: 78d66ba6df
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
dd62566e7c
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]]
Former-commit-id: a1071e3204
Former-commit-id: 9cce94e63a [formerly dbe07ca70c] [formerly c8ede12f88d71b1fa54dc220cc2b1866cb44d9e8 [formerly 8f4ddad22c]]
Former-commit-id: a822a26595a3bbeeeebb85b374d317db53bd3919 [formerly d507458b9b]
Former-commit-id: b62ac9c78e
|
2012-08-06 08:23:04 -05:00 |
|
Bryan Kowal
|
e52e61fb6f
|
Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7
Former-commit-id: 4b329f54fe [formerly 40e69fad53] [formerly e371bd14dd] [formerly 4b329f54fe [formerly 40e69fad53] [formerly e371bd14dd] [formerly 08651d2c21 [formerly e371bd14dd [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]]]
Former-commit-id: 08651d2c21
Former-commit-id: d887a8b33f [formerly 185daa58d9] [formerly 23db5d4b07ffb7bf2bf1a3fb565f40d500f73de9 [formerly a70bbf3e4d]]
Former-commit-id: 480db83057ef3c774645fdd164b8b4c00dc61496 [formerly ed6b7edbe1]
Former-commit-id: 4500559264
|
2012-08-02 16:13:58 -05:00 |
|
Steve Harris
|
5d5bcddfd2
|
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c [formerly d2291ba23f] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628]
Former-commit-id: 078b4fff3c
|
2012-08-01 12:43:12 -05:00 |
|
Bryan Kowal
|
9efdd07113
|
Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures.
Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6
Former-commit-id: dd451f392f [formerly 6126e4316a] [formerly 485334331a] [formerly dd451f392f [formerly 6126e4316a] [formerly 485334331a] [formerly d07281ac51 [formerly 485334331a [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]]]
Former-commit-id: d07281ac51
Former-commit-id: 17a9da0402 [formerly 5b7330ca01] [formerly f8fef4627ebba88a297740ab1ae189fd855e752d [formerly 024a23e7a3]]
Former-commit-id: ab3c3d4e8f7ff971ad7a7ca76479b8d4e082ce15 [formerly 692e1d539a]
Former-commit-id: 2c7a012129
|
2012-08-01 11:50:24 -05:00 |
|
Steve Harris
|
1098368e19
|
12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
|
2012-08-01 10:45:37 -05:00 |
|
Bryan Kowal
|
3621b4ba95
|
Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f
Former-commit-id: 1110193ec1 [formerly 69bea08034] [formerly c74e48e4a4] [formerly 1110193ec1 [formerly 69bea08034] [formerly c74e48e4a4] [formerly aa5b16537f [formerly c74e48e4a4 [formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]]]]
Former-commit-id: aa5b16537f
Former-commit-id: c78d1ed289 [formerly d27bdae074] [formerly c7e6de11e0697cf7922d60a37d913b5b11aa14c2 [formerly 9fe0b6a424]]
Former-commit-id: 5dff42adfaa332fe2cd8c332b03f1f417836079a [formerly 0957da3896]
Former-commit-id: 67f3b45f91
|
2012-07-29 09:40:01 -05:00 |
|
Bryan Kowal
|
64435bbe54
|
Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6
Former-commit-id: 1208c5cd40 [formerly 67035fa0b8] [formerly 327ffa9439] [formerly 1208c5cd40 [formerly 67035fa0b8] [formerly 327ffa9439] [formerly cd40d9accf [formerly 327ffa9439 [formerly dca54e56436ace397c6163b03ac4edb480336404]]]]
Former-commit-id: cd40d9accf
Former-commit-id: eafdfd70e7 [formerly 6ac43a3c0c] [formerly d17306f65f051e6041f44ee338f920b2f02bce6e [formerly 107831f23d]]
Former-commit-id: ecdc2306839bff74ea0acce5dd550c7a6acb9b9f [formerly e0c0b5928f]
Former-commit-id: 93967d22c2
|
2012-07-28 08:52:36 -05:00 |
|
Steve Harris
|
a302427d08
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: e6f4b3f257 [formerly 302aa05586] [formerly de9034c96c] [formerly e6f4b3f257 [formerly 302aa05586] [formerly de9034c96c] [formerly 4688ac304f [formerly de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]]
Former-commit-id: 4688ac304f
Former-commit-id: e9f4d5b474 [formerly f2ab9cfe1a] [formerly 1e9f1a509a3a3df6aa114b32afd9c50a0af22853 [formerly b82d6772c3]]
Former-commit-id: ff305413af3ce4f661aa49a1d08c099b45e855fc [formerly acfc6eff55]
Former-commit-id: 05082b1d3a
|
2012-07-27 14:50:45 -05:00 |
|
Steve Harris
|
2e4db7ecaf
|
Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
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/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26 [formerly 9e4df42326] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f]
Former-commit-id: 84d0f1fbb6
|
2012-07-27 14:44:44 -05:00 |
|
Bryan Kowal
|
084f1ee1d6
|
Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically.
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269
Former-commit-id: 2ac7e01cc5 [formerly 991ac89f21] [formerly 7b44eaafe7] [formerly 2ac7e01cc5 [formerly 991ac89f21] [formerly 7b44eaafe7] [formerly b30c43883d [formerly 7b44eaafe7 [formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]]]]
Former-commit-id: b30c43883d
Former-commit-id: 65b390e1f1 [formerly d52c9b0c6a] [formerly 6a54d049de45015a52c6e297e53d81e2dc84da1c [formerly 74e2382060]]
Former-commit-id: 0592a3a71acd2486b151ebab3d8623454dda9f68 [formerly e9be899355]
Former-commit-id: 1dc713c0ff
|
2012-07-26 13:47:25 -05:00 |
|
Bryan Kowal
|
eadcae96ff
|
Issue #959 - fix for manual command-line executions of the full rpm build.
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d
Former-commit-id: e9a437e219 [formerly 6b068353e9] [formerly e31fd00613] [formerly e9a437e219 [formerly 6b068353e9] [formerly e31fd00613] [formerly 2011493fda [formerly e31fd00613 [formerly b66b6fd7498e441290772be4b6906e58ac385511]]]]
Former-commit-id: 2011493fda
Former-commit-id: 135071b128 [formerly a307242aea] [formerly 6bbcfa1f0027d814121bc9f30c98913b75002786 [formerly 8b44fbfb4f]]
Former-commit-id: 81fe14780b12f99e9664443294dacb71736b28fe [formerly 9ebeabe2cf]
Former-commit-id: 2d8cf1f469
|
2012-07-25 14:13:35 -05:00 |
|
Bryan Kowal
|
8e45d5b4c6
|
Issue #768 - scripts no longer need to be executable.
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83
Former-commit-id: 5188c4644b [formerly 4071fa2e74] [formerly fe4a515422] [formerly 5188c4644b [formerly 4071fa2e74] [formerly fe4a515422] [formerly 88fdb461ea [formerly fe4a515422 [formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]]]]
Former-commit-id: 88fdb461ea
Former-commit-id: 76798b8673 [formerly 94180bacc8] [formerly c5c148b5d7e485573e9b7e024aa6dd8301823b71 [formerly efefe956d2]]
Former-commit-id: 05b46d1015dc3166829a45e81c02201a65ac749d [formerly f3b0d9571f]
Former-commit-id: f4ade9c152
|
2012-07-24 10:12:33 -05:00 |
|
Steve Harris
|
23dc8deeb0
|
12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
8b866abae6
|
Issue #760 - upgraded the lapack library.
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e
Former-commit-id: 54ed0e824b [formerly 6a6dc780bc] [formerly 10cde34ffe] [formerly 54ed0e824b [formerly 6a6dc780bc] [formerly 10cde34ffe] [formerly 95d0565b6d [formerly 10cde34ffe [formerly 47b881f604fec3591827f66481ff820032278aa0]]]]
Former-commit-id: 95d0565b6d
Former-commit-id: bb8b3478d8 [formerly 101c1f46fb] [formerly 9f279de0731a04f2f1f720db32d869b4fcc31a9c [formerly 56a2fa4068]]
Former-commit-id: f31d66cbb349938a9c238f00ccc8e13280ddac92 [formerly f82e477bd1]
Former-commit-id: 24262143dc
|
2012-07-19 11:05:13 -05:00 |
|
Bryan Kowal
|
457259d95e
|
Issue #913 - fix the correct RadarServer start-config file.
Former-commit-id: 6f119cdb8a [formerly 0651a04d0e] [formerly 1e13956bce] [formerly 6f119cdb8a [formerly 0651a04d0e] [formerly 1e13956bce] [formerly 132870666a [formerly 1e13956bce [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]]]]
Former-commit-id: 132870666a
Former-commit-id: ec8bfc57b9 [formerly f9bfa30a32] [formerly 3d9dea96dc898463aa692086d87dce68f2398ab6 [formerly 30e2defaf8]]
Former-commit-id: 18d37fbe8f1a8768146caeea8140a1f7b6072d80 [formerly 852d1f2b8b]
Former-commit-id: 5286a4fbcd
|
2012-07-19 09:31:34 -05:00 |
|
Bryan Kowal
|
1bf8b23695
|
Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208
Former-commit-id: 642bd6d582 [formerly 2670a3d7b3] [formerly 0ecf2f92c1] [formerly 642bd6d582 [formerly 2670a3d7b3] [formerly 0ecf2f92c1] [formerly 7524f8ad8d [formerly 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]]]]
Former-commit-id: 7524f8ad8d
Former-commit-id: 7ea050461f [formerly 250a553c35] [formerly b3228eeb2c91e6611c30b71f1855b6bc7d7f3b41 [formerly d908d0add3]]
Former-commit-id: fa04d8a895ea5303fcd460ab7b1e8250d9aaea51 [formerly 7ad3a9f249]
Former-commit-id: 990f5558da
|
2012-07-18 11:12:09 -05:00 |
|
Bryan Kowal
|
65c619ab09
|
Issue #889 - specified the full path to awips2-ant.
Former-commit-id: 0b49b7db45 [formerly a56cc7060b] [formerly c32bb9556e] [formerly 0b49b7db45 [formerly a56cc7060b] [formerly c32bb9556e] [formerly 41bb75fa61 [formerly c32bb9556e [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]]]]
Former-commit-id: 41bb75fa61
Former-commit-id: 545668d74c [formerly d84d08c641] [formerly e11bcd965969002fda6342c5478bbd8834a3cd86 [formerly 90e005eec4]]
Former-commit-id: e6acabe72d33a1d6a6d4182cddc780affab378b6 [formerly 22555d73c1]
Former-commit-id: df3ee1a8f3
|
2012-07-14 08:51:00 -05:00 |
|
Bryan Kowal
|
80875985e1
|
Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 302e87f975 [formerly 34a4f58074] [formerly b71427b1b065dcf68000893375f8b019e4a32137 [formerly 46198b0c92]]
Former-commit-id: 6d4f722b2ceb4bc80697f4f3dc2b3ebe3a204d0a [formerly de1d59a174]
Former-commit-id: fee2a4e419
|
2012-07-12 12:58:40 -05:00 |
|
Bryan Kowal
|
0e31c23ec4
|
Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]]
Former-commit-id: 3b7c761f99
Former-commit-id: e07c3c20b5 [formerly 470511d9a3] [formerly 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]]
Former-commit-id: 281f96fab761d65add6971c8397918fee705ea1a [formerly f64ce786e2]
Former-commit-id: 7077599e8d
|
2012-07-11 12:44:32 -05:00 |
|
Bryan Kowal
|
aa6196fcc5
|
Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.
Former-commit-id: 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly c7a172f97a [formerly b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]]]
Former-commit-id: c7a172f97a
Former-commit-id: 38f5b0d3b8 [formerly 8aea713004] [formerly 14635ee7a33af24a843b10200822f7105e7b3f28 [formerly 7ace6b7acb]]
Former-commit-id: 9802908fb51bdb1d2062e947557d67175edcdaaf [formerly 8d6415ee35]
Former-commit-id: e500a413ba
|
2012-07-11 09:42:46 -05:00 |
|
Bryan Kowal
|
c152d7678f
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]]
Former-commit-id: f92eb59a73
Former-commit-id: 76ee9afb3f [formerly 8d64fdba2c] [formerly 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]]
Former-commit-id: 3ef9b4970b7c7eec89ff3c64f7174952b28b4ded [formerly 212afcceea]
Former-commit-id: 5b4c392e7f
|
2012-07-10 16:57:16 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
e05b247e3b
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
|
2012-06-27 17:21:48 -05:00 |
|
Bryan Kowal
|
b28d23c4b0
|
Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
Former-commit-id: b382ae8a1e [formerly dd0936cfd9] [formerly 003c669ae5] [formerly b382ae8a1e [formerly dd0936cfd9] [formerly 003c669ae5] [formerly 022777b7ec [formerly 003c669ae5 [formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]]]]
Former-commit-id: 022777b7ec
Former-commit-id: 4afd1372b9 [formerly 4ac49d172d] [formerly 5ce62d298f8853c96c50a381a4dedf1071c7aede [formerly 251b5fd79e]]
Former-commit-id: d016f2143a5ec65c788fc9832afa781553aac5be [formerly 3a21d467e2]
Former-commit-id: e12877f829
|
2012-06-21 09:54:25 -05:00 |
|
Steve Harris
|
8080ea523b
|
12.6.1-10 baseline
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6 [formerly efe25edfad] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44]
Former-commit-id: 56f8cf00a8
|
2012-06-21 08:58:00 -05:00 |
|
Steve Harris
|
c7356570ae
|
Revert "12.6.1-10 baseline"
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].
Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
8d09188a88
|
12.6.1-10 baseline
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
c2e4f38618
|
Issue #708 - update the binlightning edex specs.
Former-commit-id: 62b2293a2a [formerly 1cf8c09f4d] [formerly bd20a47c90] [formerly 62b2293a2a [formerly 1cf8c09f4d] [formerly bd20a47c90] [formerly f2a3f33e07 [formerly bd20a47c90 [formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]]]]
Former-commit-id: f2a3f33e07
Former-commit-id: 692c4cae72 [formerly 071e7a51d9] [formerly fada994d194ae9673698caa02b646cdbbee39665 [formerly 59d98d5c11]]
Former-commit-id: 7cba69609be5739a90e2ad9992bdbcf445b23a39 [formerly 657290655b]
Former-commit-id: 9ebfd6ef9c
|
2012-06-20 16:00:40 -05:00 |
|
Bryan Kowal
|
41916b3e01
|
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly a828d869a0 [formerly d20417a793 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]]]
Former-commit-id: a828d869a0
Former-commit-id: fe2c592edc [formerly 7ac868e3c7] [formerly 0237c8d764ada3f7a1e6a9ba396990a9fd82cb43 [formerly 916ce42ff8]]
Former-commit-id: fe01b191ff5a0383a52b9187bf968513677b9762 [formerly 424121af9d]
Former-commit-id: 48d821f5f8
|
2012-06-20 14:47:19 -05:00 |
|
Bryan Kowal
|
eecb7d3b2f
|
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly f79134499e [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]]]
Former-commit-id: f79134499e
Former-commit-id: 4e53eadca4 [formerly 872a3a5f60] [formerly f01648537abdc924d90c96168fabc6a20dc2d827 [formerly 1acbc16759]]
Former-commit-id: ae07adff22f508ce1afff3acfa7f125a0046379e [formerly 720c2063f0]
Former-commit-id: 66028f4fe2
|
2012-06-20 11:22:58 -05:00 |
|
Bryan Kowal
|
241826ed34
|
Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 0d0ba75a14 [formerly 944a1ce201] [formerly 5aabc3bba1] [formerly 0d0ba75a14 [formerly 944a1ce201] [formerly 5aabc3bba1] [formerly dff89c83e4 [formerly 5aabc3bba1 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]]]
Former-commit-id: dff89c83e4
Former-commit-id: 1cb8279ac7 [formerly 11ea72acf0] [formerly 6bc21555bbadb2d4481dfe124a5ad7b3415643e6 [formerly 5435963041]]
Former-commit-id: 2c6f5ee749bb3932e15d58b2f0f37f3de85c557d [formerly cb8969eb0f]
Former-commit-id: e9ab580a49
|
2012-06-19 13:33:01 -05:00 |
|
Bryan Kowal
|
14f81556c3
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
|
2012-06-18 11:16:28 -05:00 |
|
Steve Harris
|
ec9204fa94
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
883d66bc46
|
12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
581546a5eb
|
12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3]
Former-commit-id: 518fa79f7f
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
61e2068af7
|
12.5.1-15 baseline
Former-commit-id: 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]]
Former-commit-id: cee20d8656
Former-commit-id: cd017cbb21 [formerly 31d7649939] [formerly 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a]]
Former-commit-id: 6cb525b2e1f0b266e8a8aef21ae0d0c57440c151 [formerly ad91dc8a2e]
Former-commit-id: ca0f3f5814
|
2012-06-11 16:02:30 -05:00 |
|
Steve Harris
|
b54ad5af66
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2]
Former-commit-id: c01b096242
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Bryan Kowal
|
a2edb47d13
|
Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.
Former-commit-id: 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly 8366f5bffa [formerly 3478f30891] [formerly b8622629e3] [formerly c0db02e377 [formerly b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]]
Former-commit-id: c0db02e377
Former-commit-id: 1397ac4ae6 [formerly 733b34202f] [formerly b02340a5b6e6f0e27447ad5a1f532ed0a3b37d18 [formerly d92eb0c227]]
Former-commit-id: a5cf683e790b615a5bad87dc4f842fa91d4710a1 [formerly 2b48d12f7c]
Former-commit-id: 89a427c142
|
2012-06-05 16:55:52 -05:00 |
|
Bryan Kowal
|
344e7567ae
|
Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1
Former-commit-id: 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 3149e73d76 [formerly 8ee68911fb] [formerly a808bc245f] [formerly 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 304ce341b8 [formerly b817484c67] [formerly 1d8ed9e871f8274a9db57fa6db67ccd77f68abfa [formerly 0211167d87]]
Former-commit-id: e6a8df53928cd8442f4e71b1f738aa3bf1de31b5 [formerly e7f2ec38b5]
Former-commit-id: e5fd40d59e
|
2012-05-24 16:51:35 -05:00 |
|
Steve Harris
|
e460104ec9
|
12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly ba6d779949 [formerly df80148db6] [formerly 24474489f9] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025 [formerly 4792884ab2] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019]
Former-commit-id: 26ed02c3dc
|
2012-05-16 16:41:22 -05:00 |
|
Bryan Kowal
|
0b0d0fe3ab
|
Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
Former-commit-id: 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly 35c8df1b0a [formerly 38f61f4a73] [formerly ea8bf623cf] [formerly fbb694b48e [formerly ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]]]
Former-commit-id: fbb694b48e
Former-commit-id: c557f812ae [formerly cbe0691efd] [formerly 220b395157e5157821d8ab81715fe4b80ec576e2 [formerly f7cba22ee2]]
Former-commit-id: 4357a37d3bdaa0f9bdd1ae191f613d97876311b3 [formerly 7f6a6ff856]
Former-commit-id: 4f7aa56ad1
|
2012-05-10 09:24:56 -05:00 |
|
Steve Harris
|
2f6ae50479
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
c76fddc7e4
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640]
Former-commit-id: 1d2ad9224a
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
6715112613
|
12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e [formerly f6300cd995] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413]
Former-commit-id: ef49f63d8d
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
ad3bb08978
|
12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]]
Former-commit-id: 01457fbbde
Former-commit-id: caab7c1fbb [formerly 97caaa0327] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]]
Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb]
Former-commit-id: f1eb6efb23
|
2012-04-24 15:38:29 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Bryan Kowal
|
af724d221a
|
Issue #453 - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm.
Former-commit-id: e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly e5c1761860 [formerly 51688bb591] [formerly fadb50446d] [formerly 298ab2e057 [formerly fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]]]
Former-commit-id: 298ab2e057
Former-commit-id: 706deb7c81 [formerly fb02245232] [formerly c9ae7cff3acaca8aa2da593554b31f3a03757a19 [formerly 62e4e0bbea]]
Former-commit-id: 0a517de94bd683b763a00f53701f6f88f16d1af0 [formerly b00be4fdeb]
Former-commit-id: f6e4e22f23
|
2012-04-16 17:00:30 -05:00 |
|