Bryan Kowal
6126e4316a
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: d07281ac51
[formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]
Former-commit-id: 485334331a
2012-08-01 11:50:24 -05:00
Bryan Kowal
69bea08034
Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
...
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f
Former-commit-id: aa5b16537f
[formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]
Former-commit-id: c74e48e4a4
2012-07-29 09:40:01 -05:00
Bryan Kowal
67035fa0b8
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: cd40d9accf
[formerly dca54e56436ace397c6163b03ac4edb480336404]
Former-commit-id: 327ffa9439
2012-07-28 08:52:36 -05:00
Steve Harris
302aa05586
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 4688ac304f
[formerly d2a398126648eaf391ddf39f99a77c0f40d08618]
Former-commit-id: de9034c96c
2012-07-27 14:50:45 -05:00
Steve Harris
07c40a9c0c
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: 587bb6a274
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 56249c2611
2012-07-27 14:44:44 -05:00
Bryan Kowal
991ac89f21
Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically.
...
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269
Former-commit-id: b30c43883d
[formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]
Former-commit-id: 7b44eaafe7
2012-07-26 13:47:25 -05:00
Bryan Kowal
6b068353e9
Issue #959 - fix for manual command-line executions of the full rpm build.
...
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d
Former-commit-id: 2011493fda
[formerly b66b6fd7498e441290772be4b6906e58ac385511]
Former-commit-id: e31fd00613
2012-07-25 14:13:35 -05:00
Bryan Kowal
4071fa2e74
Issue #768 - scripts no longer need to be executable.
...
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83
Former-commit-id: 88fdb461ea
[formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]
Former-commit-id: fe4a515422
2012-07-24 10:12:33 -05:00
Steve Harris
11f96dbedd
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
2012-07-19 16:20:40 -05:00
Bryan Kowal
6a6dc780bc
Issue #760 - upgraded the lapack library.
...
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e
Former-commit-id: 95d0565b6d
[formerly 47b881f604fec3591827f66481ff820032278aa0]
Former-commit-id: 10cde34ffe
2012-07-19 11:05:13 -05:00
Bryan Kowal
0651a04d0e
Issue #913 - fix the correct RadarServer start-config file.
...
Former-commit-id: 132870666a
[formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]
Former-commit-id: 1e13956bce
2012-07-19 09:31:34 -05:00
Bryan Kowal
2670a3d7b3
Issue #913 - fixed the paths for Radar Server.
...
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208
Former-commit-id: 7524f8ad8d
[formerly f43666937b14fdee3dd06d6da42be42b67096b2b]
Former-commit-id: 0ecf2f92c1
2012-07-18 11:12:09 -05:00
Bryan Kowal
a56cc7060b
Issue #889 - specified the full path to awips2-ant.
...
Former-commit-id: 41bb75fa61
[formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]
Former-commit-id: c32bb9556e
2012-07-14 08:51:00 -05:00
Bryan Kowal
b446253674
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: 1e5b71ee7b
[formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]
Former-commit-id: db6b535eb6
2012-07-12 12:58:40 -05:00
Bryan Kowal
8fef600e84
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: 3b7c761f99
[formerly cd948be11933b849836e3c774e668fa3bf6943ad]
Former-commit-id: ab2c53ae0a
2012-07-11 12:44:32 -05:00
Bryan Kowal
0e279845ba
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: c7a172f97a
[formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]
Former-commit-id: b79f5a3c2b
2012-07-11 09:42:46 -05:00
Bryan Kowal
c629f18f24
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: f92eb59a73
[formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: 99d22f395a
2012-07-10 16:57:16 -05:00
Steve Harris
7c064b6868
12.6.1-9 baseline
...
Former-commit-id: 27afa60345
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Bryan Kowal
b1b294c401
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: b87b66abc5
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: a33740e915
2012-06-27 17:21:48 -05:00
Bryan Kowal
dd0936cfd9
Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
...
Former-commit-id: 022777b7ec
[formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]
Former-commit-id: 003c669ae5
2012-06-21 09:54:25 -05:00
Steve Harris
edac4d827c
12.6.1-10 baseline
...
Former-commit-id: 3cd0902b49
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]
Former-commit-id: 8dc4a774e2
2012-06-21 08:58:00 -05:00
Steve Harris
62cf6a9f92
Revert "12.6.1-10 baseline"
...
This reverts commit 06f1c7b73c
[formerly ddde63eee0
] [formerly a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: 25198a5cd6
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: b4b1f6975f
2012-06-21 08:51:08 -05:00
Steve Harris
06f1c7b73c
12.6.1-10 baseline
...
Former-commit-id: a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: ddde63eee0
2012-06-21 08:38:48 -05:00
Bryan Kowal
1cf8c09f4d
Issue #708 - update the binlightning edex specs.
...
Former-commit-id: f2a3f33e07
[formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]
Former-commit-id: bd20a47c90
2012-06-20 16:00:40 -05:00
Bryan Kowal
ad13e81ea6
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
...
Former-commit-id: a828d869a0
[formerly 982e97b44967376b7e08138c4997a87ec1c98b44]
Former-commit-id: d20417a793
2012-06-20 14:47:19 -05:00
Bryan Kowal
11a1c4f35f
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
...
Former-commit-id: f79134499e
[formerly 0932e1173258d916a6a1caae5c943903d830c2af]
Former-commit-id: 973ceff9a7
2012-06-20 11:22:58 -05:00
Bryan Kowal
944a1ce201
Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
...
Former-commit-id: dff89c83e4
[formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]
Former-commit-id: 5aabc3bba1
2012-06-19 13:33:01 -05:00
Bryan Kowal
9361f3eb94
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: f0e3b957e3
[formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]
Former-commit-id: f528e10391
2012-06-18 11:16:28 -05:00
Steve Harris
af6c0529ad
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: 48860df690
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 2f20a86a30
2012-06-12 14:37:12 -05:00
Steve Harris
09f73b0601
12.6.1-5 baseline
...
Former-commit-id: 8947efbc7f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: c99afab05f
2012-06-11 16:23:47 -05:00
Steve Harris
7c5306b795
12.6.1-3 baseline
...
Former-commit-id: d57eb02b9e
[formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: 42f3513175
2012-06-11 16:23:47 -05:00
Steve Harris
0ca936807e
12.5.1-15 baseline
...
Former-commit-id: cee20d8656
[formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]
Former-commit-id: d5c238de07
2012-06-11 16:02:30 -05:00
Steve Harris
c7024992a3
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: d325d496f5
[formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: 37793c86b1
2012-06-11 15:24:03 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Bryan Kowal
3478f30891
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: c0db02e377
[formerly 478e494673d498121cab732717f3fc399a0b0c03]
Former-commit-id: b8622629e3
2012-06-05 16:55:52 -05:00
Bryan Kowal
8ee68911fb
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: 0f0bab6e54
[formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]
Former-commit-id: a808bc245f
2012-05-24 16:51:35 -05:00
Steve Harris
df80148db6
12.5.1-6 baseline
...
Former-commit-id: fa87dc6cf1
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: 24474489f9
2012-05-16 16:41:22 -05:00
Bryan Kowal
38f61f4a73
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: fbb694b48e
[formerly b831809423f9aa6e1da5678f2653fa52d928c132]
Former-commit-id: ea8bf623cf
2012-05-10 09:24:56 -05:00
Steve Harris
d7f7c26582
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: 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 092efd6072
2012-05-09 13:19:47 -05:00
Steve Harris
572e1bb476
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: 58037cb5d1
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 27bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
ac708c050d
12.5.1-2 baseline
...
Former-commit-id: b36c69cc67
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]
Former-commit-id: 84d191e7b6
2012-05-03 19:17:13 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
418489e726
12.4.1-10 baseline
...
Former-commit-id: 01457fbbde
[formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]
Former-commit-id: 704b75e1a1
2012-04-24 15:38:29 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Bryan Kowal
51688bb591
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: 298ab2e057
[formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]
Former-commit-id: fadb50446d
2012-04-16 17:00:30 -05:00
Bryan Kowal
b561cc5c85
Issue #450 - add the cave viz collaboration rpm to the yum groups.
...
Former-commit-id: 25c3f269bf
[formerly 56612b7cd64e16aa7af358ca251679a76781e36a]
Former-commit-id: 58b10dd9ae
2012-04-11 10:28:30 -05:00
Steve Harris
c90ce9d54e
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: fee53dea94
[formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]
Former-commit-id: ed26e06df2
2012-04-10 12:50:03 -05:00
Bryan Kowal
f49aadd9c8
Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
...
Former-commit-id: 839d7c886f
[formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]
Former-commit-id: 1afa927c33
2012-04-09 09:32:45 -05:00
Bryan Kowal
3e039dc79f
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
...
Former-commit-id: 2ed20e107d
[formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]
Former-commit-id: e792b2a16f
2012-04-04 18:29:13 -05:00
Steve Harris
0e4128712b
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd9
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
2012-03-30 08:38:33 -05:00