Bryan Kowal
455d7b90a9
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: b87b66abc5a33740e915a33740e915b1b294c401
2012-06-27 17:21:48 -05:00
Bryan Kowal
b382ae8a1e
Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
...
Former-commit-id: 022777b7ec003c669ae5003c669ae5dd0936cfd9
2012-06-21 09:54:25 -05:00
Steve Harris
a9742f306e
12.6.1-10 baseline
...
Former-commit-id: 3cd0902b498dc4a774e28dc4a774e2edac4d827c
2012-06-21 08:58:00 -05:00
Steve Harris
584f7eddf8
Revert "12.6.1-10 baseline"
...
This reverts commit 16fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee025198a5cd6b4b1f6975fb4b1f6975f62cf6a9f92
2012-06-21 08:51:08 -05:00
Steve Harris
16fd236f2d
12.6.1-10 baseline
...
Former-commit-id: a2c0893d1addde63eee0ddde63eee006f1c7b73c
2012-06-21 08:38:48 -05:00
Bryan Kowal
62b2293a2a
Issue #708 - update the binlightning edex specs.
...
Former-commit-id: f2a3f33e07bd20a47c90bd20a47c901cf8c09f4d
2012-06-20 16:00:40 -05:00
Bryan Kowal
37abb38f30
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
...
Former-commit-id: a828d869a0d20417a793d20417a793ad13e81ea6
2012-06-20 14:47:19 -05:00
Bryan Kowal
80adc8bbfd
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
...
Former-commit-id: f79134499e973ceff9a7973ceff9a711a1c4f35f
2012-06-20 11:22:58 -05:00
Bryan Kowal
0d0ba75a14
Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
...
Former-commit-id: dff89c83e45aabc3bba15aabc3bba1944a1ce201
2012-06-19 13:33:01 -05:00
Bryan Kowal
9e7907ecd7
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: f0e3b957e3f528e10391f528e103919361f3eb94
2012-06-18 11:16:28 -05:00
Steve Harris
03383359f3
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: 48860df6902f20a86a302f20a86a30af6c0529ad
2012-06-12 14:37:12 -05:00
Steve Harris
1ad64ffa98
12.6.1-5 baseline
...
Former-commit-id: 8947efbc7fc99afab05fc99afab05f09f73b0601
2012-06-11 16:23:47 -05:00
Steve Harris
bc96eba820
12.6.1-3 baseline
...
Former-commit-id: d57eb02b9e42f351317542f35131757c5306b795
2012-06-11 16:23:47 -05:00
Steve Harris
244755b393
12.5.1-15 baseline
...
Former-commit-id: cee20d8656d5c238de07d5c238de070ca936807e
2012-06-11 16:02:30 -05:00
Steve Harris
975053c3dc
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: d325d496f537793c86b137793c86b1c7024992a3
2012-06-11 15:24:03 -05:00
Steve Harris
2f10c7a1e4
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5b13cbb7e00b13cbb7e008552902906
2012-06-08 13:39:48 -05:00
Bryan Kowal
8366f5bffa
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: c0db02e377b8622629e3b8622629e33478f30891
2012-06-05 16:55:52 -05:00
Bryan Kowal
3149e73d76
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: 0f0bab6e54a808bc245fa808bc245f8ee68911fb
2012-05-24 16:51:35 -05:00
Steve Harris
ba6d779949
12.5.1-6 baseline
...
Former-commit-id: fa87dc6cf124474489f924474489f9df80148db6
2012-05-16 16:41:22 -05:00
Bryan Kowal
35c8df1b0a
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: fbb694b48eea8bf623cfea8bf623cf38f61f4a73
2012-05-10 09:24:56 -05:00
Steve Harris
fc70139990
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: 31b3e87ffa092efd6072092efd6072d7f7c26582
2012-05-09 13:19:47 -05:00
Steve Harris
bcc12e03ed
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: 58037cb5d127bc36981827bc369818572e1bb476
2012-05-09 13:14:00 -05:00
Steve Harris
c1bc408f84
12.5.1-2 baseline
...
Former-commit-id: b36c69cc6784d191e7b684d191e7b6ac708c050d
2012-05-03 19:17:13 -05:00
Steve Harris
7fa9dbd5fb
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a59f8cb727a54bfbdad17d
2012-05-01 18:06:13 -05:00
Steve Harris
931087306f
12.4.1-10 baseline
...
Former-commit-id: 01457fbbde704b75e1a1704b75e1a1418489e726
2012-04-24 15:38:29 -05:00
Steve Harris
4767b0e069
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a6830067a5a68300750b7543dd
2012-04-18 15:18:16 -05:00
Bryan Kowal
e5c1761860
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: 298ab2e057fadb50446dfadb50446d51688bb591
2012-04-16 17:00:30 -05:00
Bryan Kowal
77dcca12a8
Issue #450 - add the cave viz collaboration rpm to the yum groups.
...
Former-commit-id: 25c3f269bf58b10dd9ae58b10dd9aeb561cc5c85
2012-04-11 10:28:30 -05:00
Steve Harris
6a1f2160bd
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: fee53dea94ed26e06df2ed26e06df2c90ce9d54e
2012-04-10 12:50:03 -05:00
Bryan Kowal
476ad5de1f
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: 839d7c886f1afa927c331afa927c33f49aadd9c8
2012-04-09 09:32:45 -05:00
Bryan Kowal
5f9463bc57
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: 2ed20e107de792b2a16fe792b2a16f3e039dc79f
2012-04-04 18:29:13 -05:00
Steve Harris
760ead2047
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd94068f5295f4068f5295f0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
b05701d2d7
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: a0abcf812070357d90bc70357d90bc0665862abe
2012-03-29 10:03:05 -05:00
Bryan Kowal
69e6f68295
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 31f989ecb48a4c883e0b8a4c883e0b5ba68624c5
2012-03-21 16:49:38 -05:00
Bryan Kowal
dd9c964943
Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
...
Former-commit-id: 64cdd27f6255a759fb8a55a759fb8a97cb8ab51c
2012-03-16 12:16:48 -05:00
David Gillingham
edde99f0b8
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: d433b7d4d6e13850a2b6e13850a2b67e5ec12276
2012-03-13 12:31:38 -05:00
Bryan Kowal
6322415535
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: b871752e3afc1ca4efccfc1ca4efcc5838ff71f1
2012-03-08 09:00:55 -06:00
David Gillingham
d3fcc3bc54
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 78c7f2909690a745a03790a745a03715a9e7cdae
2012-03-07 16:05:54 -06:00
Bryan Kowal
bdb4777017
Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
...
Former-commit-id: c803afd4544d8d3d4d004d8d3d4d00d4142689c9
2012-03-07 10:22:40 -06:00
Bryan Kowal
3341371f4b
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 793dad57115228de77e25228de77e26e8b4a188f
2012-03-05 13:46:10 -06:00
Bryan Kowal
4ba738041e
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 94d6af30f047230422ce47230422ce861ca25a4e
2012-02-29 12:43:46 -06:00
Steve Harris
6d01784115
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: e5b56c99ab9b67525e959b67525e9524059a5b4e
2012-02-27 15:58:49 -06:00
Bryan Kowal
48d5fd8ee6
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: c2cd292c321e3e31a6571e3e31a657475849bd91
2012-02-23 16:46:48 -06:00
Bryan Kowal
e723d50244
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: e135f4508dbae0cb555ebae0cb555e4881def0e9
2012-02-23 14:20:50 -06:00
Steve Harris
0be3703c7e
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 86e586befedcadf7baa4dcadf7baa44981170462
2012-02-23 12:38:55 -06:00
Steve Harris
5a96582f16
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 7a10ca9766d0bbbfefccd0bbbfefcc92084b3f20
2012-02-23 10:06:18 -06:00
Steve Harris
829d2791e9
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1c8aae98741c8aae987418da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e2594c2ea985b94c2ea985b85075e6107
2012-02-22 10:12:49 -06:00
Steve Harris
121ec88a98
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 496cc6a06bb89ebc5e01b89ebc5e01ec0f1aebfc
2012-02-20 16:38:06 -06:00
Steve Harris
eda787edea
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: 5e9d2dd367cabf9fd956cabf9fd956d971880b98
2012-02-20 13:03:39 -06:00
