Steve Harris
0ca936807e
12.5.1-15 baseline
...
Former-commit-id: cee20d8656d5c238de07
2012-06-11 16:02:30 -05:00
Steve Harris
c7024992a3
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: d325d496f537793c86b1
2012-06-11 15:24:03 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5b13cbb7e00
2012-06-08 13:39:48 -05:00
Bryan Kowal
3478f30891
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: c0db02e377b8622629e3
2012-06-05 16:55:52 -05:00
Bryan Kowal
8ee68911fb
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: 0f0bab6e54a808bc245f
2012-05-24 16:51:35 -05:00
Steve Harris
df80148db6
12.5.1-6 baseline
...
Former-commit-id: fa87dc6cf124474489f9
2012-05-16 16:41:22 -05:00
Bryan Kowal
38f61f4a73
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: fbb694b48eea8bf623cf
2012-05-10 09:24:56 -05:00
Steve Harris
d7f7c26582
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: 31b3e87ffa092efd6072
2012-05-09 13:19:47 -05:00
Steve Harris
572e1bb476
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: 58037cb5d127bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
ac708c050d
12.5.1-2 baseline
...
Former-commit-id: b36c69cc6784d191e7b6
2012-05-03 19:17:13 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
418489e726
12.4.1-10 baseline
...
Former-commit-id: 01457fbbde704b75e1a1
2012-04-24 15:38:29 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a68300
2012-04-18 15:18:16 -05:00
Bryan Kowal
51688bb591
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: 298ab2e057fadb50446d
2012-04-16 17:00:30 -05:00
Bryan Kowal
b561cc5c85
Issue #450 - add the cave viz collaboration rpm to the yum groups.
...
Former-commit-id: 25c3f269bf58b10dd9ae
2012-04-11 10:28:30 -05:00
Steve Harris
c90ce9d54e
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: fee53dea94ed26e06df2
2012-04-10 12:50:03 -05:00
Bryan Kowal
f49aadd9c8
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: 839d7c886f1afa927c33
2012-04-09 09:32:45 -05:00
Bryan Kowal
3e039dc79f
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: 2ed20e107de792b2a16f
2012-04-04 18:29:13 -05:00
Steve Harris
0e4128712b
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd94068f5295f
2012-03-30 08:38:33 -05:00
Steve Harris
0665862abe
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: a0abcf812070357d90bc
2012-03-29 10:03:05 -05:00
Bryan Kowal
5ba68624c5
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 31f989ecb48a4c883e0b
2012-03-21 16:49:38 -05:00
Bryan Kowal
97cb8ab51c
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: 64cdd27f6255a759fb8a
2012-03-16 12:16:48 -05:00
David Gillingham
7e5ec12276
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: d433b7d4d6e13850a2b6
2012-03-13 12:31:38 -05:00
Bryan Kowal
5838ff71f1
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: b871752e3afc1ca4efcc
2012-03-08 09:00:55 -06:00
David Gillingham
15a9e7cdae
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 78c7f2909690a745a037
2012-03-07 16:05:54 -06:00
Bryan Kowal
d4142689c9
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: c803afd4544d8d3d4d00
2012-03-07 10:22:40 -06:00
Bryan Kowal
6e8b4a188f
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 793dad57115228de77e2
2012-03-05 13:46:10 -06:00
Bryan Kowal
861ca25a4e
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 94d6af30f047230422ce
2012-02-29 12:43:46 -06:00
Steve Harris
24059a5b4e
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: e5b56c99ab9b67525e95
2012-02-27 15:58:49 -06:00
Bryan Kowal
475849bd91
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: c2cd292c321e3e31a657
2012-02-23 16:46:48 -06:00
Bryan Kowal
4881def0e9
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: e135f4508dbae0cb555e
2012-02-23 14:20:50 -06:00
Steve Harris
4981170462
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: 86e586befedcadf7baa4
2012-02-23 12:38:55 -06:00
Steve Harris
92084b3f20
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: 7a10ca9766d0bbbfefcc
2012-02-23 10:06:18 -06:00
Steve Harris
8da36046de
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
85075e6107
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e2594c2ea985b
2012-02-22 10:12:49 -06:00
Steve Harris
ec0f1aebfc
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: 496cc6a06bb89ebc5e01
2012-02-20 16:38:06 -06:00
Steve Harris
d971880b98
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: 5e9d2dd367cabf9fd956
2012-02-20 13:03:39 -06:00
Steve Harris
c268da57bc
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be244b76d22f77
2012-02-20 12:43:38 -06:00
Bryan Kowal
5754f9dfd8
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 682c10767d10a0ca252d
2012-02-17 12:17:14 -06:00
Steve Harris
68a5ebc0ad
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: c1129dbd00272ba87883
2012-02-15 15:08:58 -06:00
Steve Harris
221a02882a
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: 23cc9689deb9f4780fcb
2012-02-15 14:39:43 -06:00
Steve Harris
6aed9311a8
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 1707b987217356d655da
2012-02-15 14:34:47 -06:00
Steve Harris
74c156e508
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: a91b01bfbe5e47f8c33a
2012-02-15 12:54:54 -06:00
Steve Harris
46dda7b8bd
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2e29bc8ee22119a1513e
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
808846e237
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: f65d86a06a944e59e989
2012-02-14 15:46:11 -06:00
Bryan Kowal
a19dd6ff33
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 1855bbcbee7ca62dc7d6
2012-02-09 12:14:37 -06:00
Bryan Kowal
00c0ab406b
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
...
Former-commit-id: 7d21e3149e40c0e93995
2012-01-30 16:05:17 -06:00
Bryan Kowal
b6a8534258
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: 2554090d0d998337f9f4
2012-01-30 16:01:45 -06:00
Jonathan Sanchez
869de9a03b
Issue #19 Committed changes to Wes2Bridge branch.
...
Former-commit-id: 4bce8e5ece12a5931e75
2012-01-24 10:20:28 -06:00
Bryan Kowal
a37509adf3
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
...
Former-commit-id: bda5954b3cc08293a1dc
2012-01-23 14:39:39 -06:00
