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: af6c0529ad2f20a86a3048860df69048860df69027b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
b69fa75919
12.6.1-5 baseline
...
Former-commit-id: 09f73b0601c99afab05f8947efbc7f8947efbc7fa945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
32c0464d79
12.6.1-3 baseline
...
Former-commit-id: 7c5306b79542f3513175d57eb02b9ed57eb02b9e1fdc0aa237
2012-06-11 16:23:47 -05:00
Steve Harris
31d7649939
12.5.1-15 baseline
...
Former-commit-id: 0ca936807ed5c238de07cee20d8656cee20d86567da9afe36a
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: c7024992a337793c86b1d325d496f5d325d496f5cf3c768213
2012-06-11 15:24:03 -05:00
Steve Harris
97c4db937e
12.5.1-15 baseline
...
Former-commit-id: 8552902906b13cbb7e003904c4ccf53904c4ccf5676ea3192f
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: 3478f30891b8622629e3c0db02e377c0db02e377d92eb0c227
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: 8ee68911fba808bc245f0f0bab6e540f0bab6e540211167d87
2012-05-24 16:51:35 -05:00
Steve Harris
4792884ab2
12.5.1-6 baseline
...
Former-commit-id: df80148db624474489f9fa87dc6cf1fa87dc6cf1c452cce633
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: 38f61f4a73ea8bf623cffbb694b48efbb694b48ef7cba22ee2
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: d7f7c26582092efd607231b3e87ffa31b3e87ffa98447412f8
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: 572e1bb47627bc36981858037cb5d158037cb5d163ea8599d7
2012-05-09 13:14:00 -05:00
Steve Harris
f6300cd995
12.5.1-2 baseline
...
Former-commit-id: ac708c050d84d191e7b6b36c69cc67b36c69cc67a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
33a67cdd82
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d9f8cb727a58485b90ff88485b90ff8a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
97caaa0327
12.4.1-10 baseline
...
Former-commit-id: 418489e726704b75e1a101457fbbde01457fbbdeaabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd67a5a683002a216f333c2a216f333ca4e519f3cd
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: 51688bb591fadb50446d298ab2e057298ab2e05762e4e0bbea
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: b561cc5c8558b10dd9ae25c3f269bf25c3f269bf4dec6ced9f
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: c90ce9d54eed26e06df2fee53dea94fee53dea94dcdd7f0648
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: f49aadd9c81afa927c33839d7c886f839d7c886f24148c19a9
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: 3e039dc79fe792b2a16f2ed20e107d2ed20e107d5f4d6f600a
2012-04-04 18:29:13 -05:00
Steve Harris
8bc60b1e32
12.3.1-10 baseline
...
Former-commit-id: 0e4128712b4068f5295f22bd792cd922bd792cd9ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
65aa72fee7
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 0665862abe70357d90bca0abcf8120a0abcf81206884520750
2012-03-29 10:03:05 -05:00
Bryan Kowal
e27502effd
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 5ba68624c58a4c883e0b31f989ecb431f989ecb481a360d139
2012-03-21 16:49:38 -05:00
Bryan Kowal
3914878a65
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: 97cb8ab51c55a759fb8a64cdd27f6264cdd27f62117306c734
2012-03-16 12:16:48 -05:00
David Gillingham
3c4e90e0bf
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: 7e5ec12276e13850a2b6d433b7d4d6d433b7d4d62b5588bd1e
2012-03-13 12:31:38 -05:00
Bryan Kowal
d04bc82c9a
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: 5838ff71f1fc1ca4efccb871752e3ab871752e3a638d2c964b
2012-03-08 09:00:55 -06:00
David Gillingham
5e2b3c3955
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 15a9e7cdae90a745a03778c7f2909678c7f290968a86e910aa
2012-03-07 16:05:54 -06:00
Bryan Kowal
f046b941ba
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: d4142689c94d8d3d4d00c803afd454c803afd454033a4e237b
2012-03-07 10:22:40 -06:00
Bryan Kowal
1585b4b827
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 6e8b4a188f5228de77e2793dad5711793dad571181f778e43a
2012-03-05 13:46:10 -06:00
Bryan Kowal
421c425047
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 861ca25a4e47230422ce94d6af30f094d6af30f0ca62eb90f3
2012-02-29 12:43:46 -06:00
Steve Harris
73a337bc31
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: 24059a5b4e9b67525e95e5b56c99abe5b56c99ab40d7357165
2012-02-27 15:58:49 -06:00
Bryan Kowal
d4367098a7
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 475849bd911e3e31a657c2cd292c32c2cd292c3249a30a5b1a
2012-02-23 16:46:48 -06:00
Bryan Kowal
fa23b673c4
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 4881def0e9bae0cb555ee135f4508de135f4508d5c86773a77
2012-02-23 14:20:50 -06:00
Steve Harris
4eb1ef5b0f
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: 4981170462dcadf7baa486e586befe86e586befe938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
92b7072b82
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: 92084b3f20d0bbbfefcc7a10ca97667a10ca97663d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
b55a488ed8
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 8da36046dec8aae9874154be9660f154be9660f14450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 85075e610794c2ea985b9995d22e259995d22e25aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
dd3a5a8d88
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: ec0f1aebfcb89ebc5e01496cc6a06b496cc6a06b4a93298877
2012-02-20 16:38:06 -06:00
Steve Harris
b12f5e5d75
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: d971880b98cabf9fd9565e9d2dd3675e9d2dd36733483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
dd911bed4d
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: c268da57bc4b76d22f77cc66c8be24cc66c8be2454b5b6baef
2012-02-20 12:43:38 -06:00
Bryan Kowal
cc8c6597a2
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 5754f9dfd810a0ca252d682c10767d682c10767d2ba23624b4
2012-02-17 12:17:14 -06:00
Steve Harris
4e6af98f5b
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 68a5ebc0ad272ba87883c1129dbd00c1129dbd00ad402655f4
2012-02-15 15:08:58 -06:00
Steve Harris
a85a777232
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
...
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 221a02882ab9f4780fcb23cc9689de23cc9689dea2e3aabc60
2012-02-15 14:39:43 -06:00
Steve Harris
de85613a99
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 6aed9311a87356d655da1707b987211707b98721db1e3b1215
2012-02-15 14:34:47 -06:00
Steve Harris
98b223d08e
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: 74c156e5085e47f8c33aa91b01bfbea91b01bfbe39b13d7102
2012-02-15 12:54:54 -06:00
Steve Harris
d23d12d596
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 46dda7b8bd2119a1513e2e29bc8ee22e29bc8ee2cb3371ee28
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
993f2aafa4
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 808846e237944e59e989f65d86a06af65d86a06ad00572c122
2012-02-14 15:46:11 -06:00
Bryan Kowal
88b67b4977
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: a19dd6ff337ca62dc7d61855bbcbee1855bbcbee27c4557e0a
2012-02-09 12:14:37 -06:00
Bryan Kowal
e17a1e06a7
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
...
Former-commit-id: 00c0ab406b40c0e939957d21e3149e7d21e3149ee9d85fc09c
2012-01-30 16:05:17 -06:00
