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

67 commits

Author SHA1 Message Date
Steve Harris
8edfe17e7d Merge branch 'ss_builds' (12.10.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 686b1756c9 [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]
Former-commit-id: 3827a78a7b
Former-commit-id: f5f59b6aa5
 2012-09-25 10:31:57 -05:00
Steve Harris
0e77eb2fe2 12.10.1-6 baseline 
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: ba648f8e72
Former-commit-id: 5d5a61bd75
 2012-09-25 10:14:23 -05:00
Steve Harris
e23b030dfd Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 04d9735c8f
Former-commit-id: 53673f63e6
 2012-09-13 13:26:13 -05:00
Steve Harris
684feb34e5 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00
Steve Harris
f376a4b4db 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
 2012-09-11 16:00:38 -05:00
James Korman
85191cde31 Issue #1090 - pattern corrections 
Former-commit-id: 78c7ce88ac [formerly be350dd763] [formerly eb17151f74 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]
Former-commit-id: eb17151f74
Former-commit-id: f36d089fd5
 2012-09-06 09:20:03 -05:00
Bryan Kowal
7ec6eb66ab Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick) 
Former-commit-id: 35aff16e89 [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]
Former-commit-id: 3e1556a981
Former-commit-id: a34225c4c9
 2012-09-05 14:44:36 -05:00
Steve Harris
ffe253196a Merge branch 'ss_builds' (12.9.1-11) into development 
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: f52c8b374d [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 34cbde4124
Former-commit-id: 3230e0b246
 2012-08-30 14:40:34 -05:00
Steve Harris
f43a5af47f 12.9.1-10 baseline 
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
 2012-08-30 14:28:27 -05:00
Steve Harris
b335416e06 Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 084ac9fbd4 [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
 2012-08-21 16:17:58 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
 2012-08-21 15:27:03 -05:00
root
537dbadf64 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
 2012-08-15 22:15:20 +00:00
Steve Harris
a535b51eba 12.9.1-3 baseline 
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
 2012-08-15 14:26:10 -05:00
Steve Harris
aed7a644df 12.9.1-1 baseline 
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
 2012-08-15 13:59:00 -05:00
Steve Harris
dbe07ca70c Merge branch 'development' into development_on_ss_builds 
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: a1071e3204
Former-commit-id: 8f4ddad22c
 2012-08-06 08:23:04 -05:00
Steve Harris
d2291ba23f 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: fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 51e38ca887
Former-commit-id: 3476fe755b
 2012-08-01 12:43:12 -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
Steve Harris
dab00b12e6 12.8.1-5 baseline 
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
 2012-08-01 10:45:37 -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
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
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
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
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
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
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
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
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