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
Steve Harris
d129eab241
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be244b76d22f774b76d22f77c268da57bc
2012-02-20 12:43:38 -06:00
Bryan Kowal
eda0f92b17
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 682c10767d10a0ca252d10a0ca252d5754f9dfd8
2012-02-17 12:17:14 -06:00
Steve Harris
d64ae288ba
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: c1129dbd00272ba87883272ba8788368a5ebc0ad
2012-02-15 15:08:58 -06:00
Steve Harris
6d3d1066eb
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: 23cc9689deb9f4780fcbb9f4780fcb221a02882a
2012-02-15 14:39:43 -06:00
Steve Harris
c4ced8af2d
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 1707b987217356d655da7356d655da6aed9311a8
2012-02-15 14:34:47 -06:00
Steve Harris
e21fc62dd9
Added the patch/bin directory and company to the installer.ldm for rpm builds
...
Former-commit-id: a91b01bfbe5e47f8c33a5e47f8c33a74c156e508
2012-02-15 12:54:54 -06:00
Steve Harris
c2a47087ce
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2e29bc8ee22119a1513e2119a1513e46dda7b8bd
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
2edb2afe04
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: f65d86a06a944e59e989944e59e989808846e237
2012-02-14 15:46:11 -06:00
Bryan Kowal
30ef4b72b8
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 1855bbcbee7ca62dc7d67ca62dc7d6a19dd6ff33
2012-02-09 12:14:37 -06:00
Bryan Kowal
1b39ded6e4
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
...
Former-commit-id: 7d21e3149e40c0e9399540c0e9399500c0ab406b
2012-01-30 16:05:17 -06:00
Bryan Kowal
d885bdcb6e
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: 2554090d0d998337f9f4998337f9f4b6a8534258
2012-01-30 16:01:45 -06:00
Jonathan Sanchez
a9ad92724b
Issue #19 Committed changes to Wes2Bridge branch.
...
Former-commit-id: 4bce8e5ece12a5931e7512a5931e75869de9a03b
2012-01-24 10:20:28 -06:00
Bryan Kowal
1f78572a88
Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch.
...
Former-commit-id: bda5954b3cc08293a1dcc08293a1dca37509adf3
2012-01-23 14:39:39 -06:00
Bryan Kowal
d537df4ab0
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: ea1c82452b65e1e4ee0b65e1e4ee0b4453ad2d10
2012-01-20 13:38:00 -06:00
Matt Nash
d8da2252c3
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff47466be3bec4066be3bec40580e2938d7
2012-01-19 11:53:12 -06:00
Bryan Kowal
48c7c3b950
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 9d64e1df1243c3807a3243c3807a3263f6f44fe1
2012-01-18 16:00:45 -06:00
root
133dc97f67
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d9f19e3f7129f19e3f712a02aeb236c
2012-01-06 08:55:05 -06:00
