Bryan Kowal
3a21d467e2
Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
...
Former-commit-id: 003c669ae5003c669ae5022777b7ec251b5fd79e
2012-06-21 09:54:25 -05:00
Steve Harris
df59dc7c44
12.6.1-10 baseline
...
Former-commit-id: 8dc4a774e28dc4a774e23cd0902b49eacd5aeb7f
2012-06-21 08:58:00 -05:00
Steve Harris
75f77df418
Revert "12.6.1-10 baseline"
...
This reverts commit aecc6a8474b33c5bdfcfa2c0893d1addde63eee0ddde63eee0b4b1f6975fb4b1f6975f25198a5cd68367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
aecc6a8474
12.6.1-10 baseline
...
Former-commit-id: ddde63eee0ddde63eee0a2c0893d1ab33c5bdfcf
2012-06-21 08:38:48 -05:00
Bryan Kowal
657290655b
Issue #708 - update the binlightning edex specs.
...
Former-commit-id: bd20a47c90bd20a47c90f2a3f33e0759d98d5c11
2012-06-20 16:00:40 -05:00
Bryan Kowal
424121af9d
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
...
Former-commit-id: d20417a793d20417a793a828d869a0916ce42ff8
2012-06-20 14:47:19 -05:00
Bryan Kowal
720c2063f0
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
...
Former-commit-id: 973ceff9a7973ceff9a7f79134499e1acbc16759
2012-06-20 11:22:58 -05:00
Bryan Kowal
cb8969eb0f
Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
...
Former-commit-id: 5aabc3bba15aabc3bba1dff89c83e45435963041
2012-06-19 13:33:01 -05:00
Bryan Kowal
cbc8964e5b
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: f528e10391f528e10391f0e3b957e31ee59eac71
2012-06-18 11:16:28 -05:00
Steve Harris
2838ca117f
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: 2f20a86a302f20a86a3048860df69027b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
91e65230ad
12.6.1-5 baseline
...
Former-commit-id: c99afab05fc99afab05f8947efbc7fa945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
ca8baf18a3
12.6.1-3 baseline
...
Former-commit-id: 42f351317542f3513175d57eb02b9e1fdc0aa237
2012-06-11 16:23:47 -05:00
Steve Harris
ad91dc8a2e
12.5.1-15 baseline
...
Former-commit-id: d5c238de07d5c238de07cee20d86567da9afe36a
2012-06-11 16:02:30 -05:00
Steve Harris
3dd5b84aa2
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: 37793c86b137793c86b1d325d496f5cf3c768213
2012-06-11 15:24:03 -05:00
Steve Harris
9054c5ab6c
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e00b13cbb7e003904c4ccf5676ea3192f
2012-06-08 13:39:48 -05:00
Bryan Kowal
2b48d12f7c
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: b8622629e3b8622629e3c0db02e377d92eb0c227
2012-06-05 16:55:52 -05:00
Bryan Kowal
e7f2ec38b5
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: a808bc245fa808bc245f0f0bab6e540211167d87
2012-05-24 16:51:35 -05:00
Steve Harris
2738af2019
12.5.1-6 baseline
...
Former-commit-id: 24474489f924474489f9fa87dc6cf1c452cce633
2012-05-16 16:41:22 -05:00
Bryan Kowal
7f6a6ff856
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: ea8bf623cfea8bf623cffbb694b48ef7cba22ee2
2012-05-10 09:24:56 -05:00
Steve Harris
7ee04eb560
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: 092efd6072092efd607231b3e87ffa98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
7978d3b640
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: 27bc36981827bc36981858037cb5d163ea8599d7
2012-05-09 13:14:00 -05:00
Steve Harris
377ae76413
12.5.1-2 baseline
...
Former-commit-id: 84d191e7b684d191e7b6b36c69cc67a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
e5543a0e86
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a59f8cb727a58485b90ff8a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
3ed3a665cb
12.4.1-10 baseline
...
Former-commit-id: 704b75e1a1704b75e1a101457fbbdeaabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
8cd5974f4c
12.4.1-4 baseline
...
Former-commit-id: 67a5a6830067a5a683002a216f333ca4e519f3cd
2012-04-18 15:18:16 -05:00
Bryan Kowal
b00be4fdeb
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: fadb50446dfadb50446d298ab2e05762e4e0bbea
2012-04-16 17:00:30 -05:00
Bryan Kowal
f0524db48b
Issue #450 - add the cave viz collaboration rpm to the yum groups.
...
Former-commit-id: 58b10dd9ae58b10dd9ae25c3f269bf4dec6ced9f
2012-04-11 10:28:30 -05:00
Steve Harris
58cb18d860
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: ed26e06df2ed26e06df2fee53dea94dcdd7f0648
2012-04-10 12:50:03 -05:00
Bryan Kowal
adaa011b1f
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: 1afa927c331afa927c33839d7c886f24148c19a9
2012-04-09 09:32:45 -05:00
Bryan Kowal
3db4653b1e
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: e792b2a16fe792b2a16f2ed20e107d5f4d6f600a
2012-04-04 18:29:13 -05:00
Steve Harris
2e0f4b241b
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f4068f5295f22bd792cd9ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
5a310acb18
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bc70357d90bca0abcf81206884520750
2012-03-29 10:03:05 -05:00
Bryan Kowal
339d963f90
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 8a4c883e0b8a4c883e0b31f989ecb481a360d139
2012-03-21 16:49:38 -05:00
Bryan Kowal
a01d2a17f9
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: 55a759fb8a55a759fb8a64cdd27f62117306c734
2012-03-16 12:16:48 -05:00
David Gillingham
2d82185a1d
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: e13850a2b6e13850a2b6d433b7d4d62b5588bd1e
2012-03-13 12:31:38 -05:00
Bryan Kowal
4c87af89f9
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: fc1ca4efccfc1ca4efccb871752e3a638d2c964b
2012-03-08 09:00:55 -06:00
David Gillingham
b70345182d
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 90a745a03790a745a03778c7f290968a86e910aa
2012-03-07 16:05:54 -06:00
Bryan Kowal
2cc79e1acb
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: 4d8d3d4d004d8d3d4d00c803afd454033a4e237b
2012-03-07 10:22:40 -06:00
Bryan Kowal
faa13ee9f7
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 5228de77e25228de77e2793dad571181f778e43a
2012-03-05 13:46:10 -06:00
Bryan Kowal
e23844d671
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 47230422ce47230422ce94d6af30f0ca62eb90f3
2012-02-29 12:43:46 -06:00
Steve Harris
21f12bae82
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: 9b67525e959b67525e95e5b56c99ab40d7357165
2012-02-27 15:58:49 -06:00
Bryan Kowal
8350501de4
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 1e3e31a6571e3e31a657c2cd292c3249a30a5b1a
2012-02-23 16:46:48 -06:00
Bryan Kowal
4a78479648
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: bae0cb555ebae0cb555ee135f4508d5c86773a77
2012-02-23 14:20:50 -06:00
Steve Harris
2c958713b6
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: dcadf7baa4dcadf7baa486e586befe938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
ae9c52b012
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: d0bbbfefccd0bbbfefcc7a10ca97663d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
15c56d11bc
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae98741c8aae9874154be9660f14450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
156ad8471d
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b94c2ea985b9995d22e25aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
37e57b6588
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: b89ebc5e01b89ebc5e01496cc6a06b4a93298877
2012-02-20 16:38:06 -06:00
Steve Harris
acd7845ebd
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: cabf9fd956cabf9fd9565e9d2dd36733483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
09b81c6e00
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f774b76d22f77cc66c8be2454b5b6baef
2012-02-20 12:43:38 -06:00
