xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
703 commits 31 branches 40 tags 3.8 GiB
Commit graph

86 commits

Author SHA1 Message Date
Bryan Kowal
185daa58d9 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: 40e69fad53 [formerly e371bd14dd] [formerly 08651d2c21 [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]
Former-commit-id: 08651d2c21
Former-commit-id: a70bbf3e4d
 2012-08-02 16:13:58 -05:00
Bryan Kowal
5b7330ca01 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: 6126e4316a [formerly 485334331a] [formerly d07281ac51 [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]
Former-commit-id: d07281ac51
Former-commit-id: 024a23e7a3
 2012-08-01 11:50:24 -05:00
Bryan Kowal
d27bdae074 Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed? 
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f

Former-commit-id: 69bea08034 [formerly c74e48e4a4] [formerly aa5b16537f [formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]]
Former-commit-id: aa5b16537f
Former-commit-id: 9fe0b6a424
 2012-07-29 09:40:01 -05:00
Bryan Kowal
6ac43a3c0c 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: 67035fa0b8 [formerly 327ffa9439] [formerly cd40d9accf [formerly dca54e56436ace397c6163b03ac4edb480336404]]
Former-commit-id: cd40d9accf
Former-commit-id: 107831f23d
 2012-07-28 08:52:36 -05:00
Steve Harris
f2ab9cfe1a Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: 302aa05586 [formerly de9034c96c] [formerly 4688ac304f [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]
Former-commit-id: 4688ac304f
Former-commit-id: b82d6772c3
 2012-07-27 14:50:45 -05:00
Steve Harris
9e4df42326 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: 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]
Former-commit-id: 587bb6a274
Former-commit-id: 2aa4114e4d
 2012-07-27 14:44:44 -05:00
Bryan Kowal
d52c9b0c6a Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically. 
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269

Former-commit-id: 991ac89f21 [formerly 7b44eaafe7] [formerly b30c43883d [formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]]
Former-commit-id: b30c43883d
Former-commit-id: 74e2382060
 2012-07-26 13:47:25 -05:00
Bryan Kowal
a307242aea Issue #959 - fix for manual command-line executions of the full rpm build. 
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d

Former-commit-id: 6b068353e9 [formerly e31fd00613] [formerly 2011493fda [formerly b66b6fd7498e441290772be4b6906e58ac385511]]
Former-commit-id: 2011493fda
Former-commit-id: 8b44fbfb4f
 2012-07-25 14:13:35 -05:00
Bryan Kowal
94180bacc8 Issue #768 - scripts no longer need to be executable. 
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83

Former-commit-id: 4071fa2e74 [formerly fe4a515422] [formerly 88fdb461ea [formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]]
Former-commit-id: 88fdb461ea
Former-commit-id: efefe956d2
 2012-07-24 10:12:33 -05:00
Steve Harris
f2102bfb24 12.7.1-8 baseline 
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
 2012-07-19 16:20:40 -05:00
Bryan Kowal
101c1f46fb Issue #760 - upgraded the lapack library. 
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e

Former-commit-id: 6a6dc780bc [formerly 10cde34ffe] [formerly 95d0565b6d [formerly 47b881f604fec3591827f66481ff820032278aa0]]
Former-commit-id: 95d0565b6d
Former-commit-id: 56a2fa4068
 2012-07-19 11:05:13 -05:00
Bryan Kowal
f9bfa30a32 Issue #913 - fix the correct RadarServer start-config file. 
Former-commit-id: 0651a04d0e [formerly 1e13956bce] [formerly 132870666a [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]]
Former-commit-id: 132870666a
Former-commit-id: 30e2defaf8
 2012-07-19 09:31:34 -05:00
Bryan Kowal
250a553c35 Issue #913 - fixed the paths for Radar Server. 
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208

Former-commit-id: 2670a3d7b3 [formerly 0ecf2f92c1] [formerly 7524f8ad8d [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]]
Former-commit-id: 7524f8ad8d
Former-commit-id: d908d0add3
 2012-07-18 11:12:09 -05:00
Bryan Kowal
d84d08c641 Issue #889 - specified the full path to awips2-ant. 
Former-commit-id: a56cc7060b [formerly c32bb9556e] [formerly 41bb75fa61 [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]]
Former-commit-id: 41bb75fa61
Former-commit-id: 90e005eec4
 2012-07-14 08:51:00 -05:00
Bryan Kowal
34a4f58074 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: b446253674 [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 46198b0c92
 2012-07-12 12:58:40 -05:00
Bryan Kowal
470511d9a3 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: 8fef600e84 [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]
Former-commit-id: 3b7c761f99
Former-commit-id: 424bbaf0f7
 2012-07-11 12:44:32 -05:00
Bryan Kowal
8aea713004 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: 0e279845ba [formerly b79f5a3c2b] [formerly c7a172f97a [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]
Former-commit-id: c7a172f97a
Former-commit-id: 7ace6b7acb
 2012-07-11 09:42:46 -05:00
Bryan Kowal
8d64fdba2c Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development 
Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: f92eb59a73
Former-commit-id: 580172b47c
 2012-07-10 16:57:16 -05:00
Steve Harris
dc50bc8443 12.6.1-9 baseline 
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
 2012-07-10 07:53:49 -05:00
Bryan Kowal
b4917e6708 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: b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
 2012-06-27 17:21:48 -05:00
Bryan Kowal
4ac49d172d Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository. 
Former-commit-id: dd0936cfd9 [formerly 003c669ae5] [formerly 022777b7ec [formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]]
Former-commit-id: 022777b7ec
Former-commit-id: 251b5fd79e
 2012-06-21 09:54:25 -05:00
Steve Harris
efe25edfad 12.6.1-10 baseline 
Former-commit-id: edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]
Former-commit-id: 3cd0902b49
Former-commit-id: eacd5aeb7f
 2012-06-21 08:58:00 -05:00
Steve Harris
333fd9c64e Revert "12.6.1-10 baseline" 
This reverts commit f8497470fc [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
 2012-06-21 08:51:08 -05:00
Steve Harris
f8497470fc 12.6.1-10 baseline 
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
 2012-06-21 08:38:48 -05:00
Bryan Kowal
071e7a51d9 Issue #708 - update the binlightning edex specs. 
Former-commit-id: 1cf8c09f4d [formerly bd20a47c90] [formerly f2a3f33e07 [formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]]
Former-commit-id: f2a3f33e07
Former-commit-id: 59d98d5c11
 2012-06-20 16:00:40 -05:00
Bryan Kowal
7ac868e3c7 Issue #708 - move the xmpp (openfire) rpm into the collaboration branch. 
Former-commit-id: ad13e81ea6 [formerly d20417a793] [formerly a828d869a0 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]
Former-commit-id: a828d869a0
Former-commit-id: 916ce42ff8
 2012-06-20 14:47:19 -05:00
Bryan Kowal
872a3a5f60 Issue #708 - it is now possible to build edex rpms in the new baseline repository. 
Former-commit-id: 11a1c4f35f [formerly 973ceff9a7] [formerly f79134499e [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]
Former-commit-id: f79134499e
Former-commit-id: 1acbc16759
 2012-06-20 11:22:58 -05:00
Bryan Kowal
11ea72acf0 Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository. 
Former-commit-id: 944a1ce201 [formerly 5aabc3bba1] [formerly dff89c83e4 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]
Former-commit-id: dff89c83e4
Former-commit-id: 5435963041
 2012-06-19 13:33:01 -05:00
Bryan Kowal
21e8618852 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: 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
 2012-06-18 11:16:28 -05:00
Steve Harris
d7a4853091 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: af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
 2012-06-12 14:37:12 -05:00
Steve Harris
b69fa75919 12.6.1-5 baseline 
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
 2012-06-11 16:23:47 -05:00
Steve Harris
32c0464d79 12.6.1-3 baseline 
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: d57eb02b9e
Former-commit-id: 1fdc0aa237
 2012-06-11 16:23:47 -05:00
Steve Harris
31d7649939 12.5.1-15 baseline 
Former-commit-id: 0ca936807e [formerly d5c238de07] [formerly cee20d8656 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]
Former-commit-id: cee20d8656
Former-commit-id: 7da9afe36a
 2012-06-11 16:02:30 -05:00
Steve Harris
23c34c469a 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: c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: d325d496f5
Former-commit-id: cf3c768213
 2012-06-11 15:24:03 -05:00
Steve Harris
97c4db937e 12.5.1-15 baseline 
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
 2012-06-08 13:39:48 -05:00
Bryan Kowal
733b34202f 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: 3478f30891 [formerly b8622629e3] [formerly c0db02e377 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]
Former-commit-id: c0db02e377
Former-commit-id: d92eb0c227
 2012-06-05 16:55:52 -05:00
Bryan Kowal
b817484c67 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: 8ee68911fb [formerly a808bc245f] [formerly 0f0bab6e54 [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 0211167d87
 2012-05-24 16:51:35 -05:00
Steve Harris
4792884ab2 12.5.1-6 baseline 
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
 2012-05-16 16:41:22 -05:00
Bryan Kowal
cbe0691efd 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: 38f61f4a73 [formerly ea8bf623cf] [formerly fbb694b48e [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]
Former-commit-id: fbb694b48e
Former-commit-id: f7cba22ee2
 2012-05-10 09:24:56 -05:00
Steve Harris
53d2822329 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: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
 2012-05-09 13:19:47 -05:00
Steve Harris
9c9e01dbda 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: 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
 2012-05-09 13:14:00 -05:00
Steve Harris
f6300cd995 12.5.1-2 baseline 
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
 2012-05-03 19:17:13 -05:00
Steve Harris
33a67cdd82 12.4.1-10 baseline 
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
 2012-05-01 18:06:13 -05:00
Steve Harris
97caaa0327 12.4.1-10 baseline 
Former-commit-id: 418489e726 [formerly 704b75e1a1] [formerly 01457fbbde [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 01457fbbde
Former-commit-id: aabc3842ac
 2012-04-24 15:38:29 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline 
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
 2012-04-18 15:18:16 -05:00
Bryan Kowal
fb02245232 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: 51688bb591 [formerly fadb50446d] [formerly 298ab2e057 [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]
Former-commit-id: 298ab2e057
Former-commit-id: 62e4e0bbea
 2012-04-16 17:00:30 -05:00
Bryan Kowal
30c2ed6fed Issue #450 - add the cave viz collaboration rpm to the yum groups. 
Former-commit-id: b561cc5c85 [formerly 58b10dd9ae] [formerly 25c3f269bf [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]]
Former-commit-id: 25c3f269bf
Former-commit-id: 4dec6ced9f
 2012-04-11 10:28:30 -05:00
Steve Harris
51bb9ebb46 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: c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: fee53dea94
Former-commit-id: dcdd7f0648
 2012-04-10 12:50:03 -05:00
Bryan Kowal
ab70749ea4 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: f49aadd9c8 [formerly 1afa927c33] [formerly 839d7c886f [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]
Former-commit-id: 839d7c886f
Former-commit-id: 24148c19a9
 2012-04-09 09:32:45 -05:00
Bryan Kowal
edb7431d0a 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: 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: 2ed20e107d
Former-commit-id: 5f4d6f600a
 2012-04-04 18:29:13 -05:00