xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1640 commits 31 branches 40 tags 3.8 GiB
Commit graph

155 commits

Author SHA1 Message Date
Steve Harris
d57eb02b9e 12.6.1-3 baseline 
Former-commit-id: 2f4e12140a9b026770563eee58577b8aa2c041e1
 2012-06-11 16:23:47 -05:00
Steve Harris
cee20d8656 12.5.1-15 baseline 
Former-commit-id: 1c128372ef9f478f1b807e8d0f23207d095bfc65
 2012-06-11 16:02:30 -05:00
Steve Harris
d325d496f5 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: a435e6464a78345b5036e3060430375dc53e4faf
 2012-06-11 15:24:03 -05:00
Steve Harris
3904c4ccf5 12.5.1-15 baseline 
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
 2012-06-08 13:39:48 -05:00
Bryan Kowal
c0db02e377 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: 478e494673d498121cab732717f3fc399a0b0c03
 2012-06-05 16:55:52 -05:00
Bryan Kowal
0f0bab6e54 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: f4ac8e99d3f2f98af4ea5f383630395705e6da96
 2012-05-24 16:51:35 -05:00
Steve Harris
fa87dc6cf1 12.5.1-6 baseline 
Former-commit-id: a75af2f0de38d65dcbbd919e159c3b0a268fc245
 2012-05-16 16:41:22 -05:00
Bryan Kowal
fbb694b48e 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: b831809423f9aa6e1da5678f2653fa52d928c132
 2012-05-10 09:24:56 -05:00
Steve Harris
31b3e87ffa 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: f98354aae305ad227eaf3b36e4393b8aefc80f02
 2012-05-09 13:19:47 -05:00
Steve Harris
58037cb5d1 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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
 2012-05-09 13:14:00 -05:00
Steve Harris
b36c69cc67 12.5.1-2 baseline 
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
 2012-05-03 19:17:13 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline 
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
 2012-05-01 18:06:13 -05:00
Steve Harris
01457fbbde 12.4.1-10 baseline 
Former-commit-id: 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a
 2012-04-24 15:38:29 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Bryan Kowal
298ab2e057 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: 5afc6ff942850e0781da96bdeaa1fb4ee7d54000
 2012-04-16 17:00:30 -05:00
Bryan Kowal
25c3f269bf Issue #450 - add the cave viz collaboration rpm to the yum groups. 
Former-commit-id: 56612b7cd64e16aa7af358ca251679a76781e36a
 2012-04-11 10:28:30 -05:00
Steve Harris
fee53dea94 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: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
 2012-04-10 12:50:03 -05:00
Bryan Kowal
839d7c886f 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: f11953c494fac20b2ad53b41069cfcb24281eb4a
 2012-04-09 09:32:45 -05:00
Bryan Kowal
2ed20e107d 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: 6b206773eff05abf20ecc87b27e96c47b67ba600
 2012-04-04 18:29:13 -05:00
Steve Harris
22bd792cd9 12.3.1-10 baseline 
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
 2012-03-30 08:38:33 -05:00
Steve Harris
a0abcf8120 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
 2012-03-29 10:03:05 -05:00
Bryan Kowal
31f989ecb4 Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly. 
Former-commit-id: efc134f920b0cc0e493d74f1bb14b22fdc8013ca
 2012-03-21 16:49:38 -05:00
Bryan Kowal
64cdd27f62 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: 47807beb71c03e26cbe4fa78bf9cdb0811a51042
 2012-03-16 12:16:48 -05:00
David Gillingham
d433b7d4d6 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process. 
Former-commit-id: 727e2b19688397ea4608a2b6ca3fda3222b6ad36
 2012-03-13 12:31:38 -05:00
Bryan Kowal
b871752e3a Issue #202 - increment the awips2-qpid release so yum will update the qpid installation. 
Former-commit-id: ff79422d30a93ca71fc83e38e0368e499a34dd59
 2012-03-08 09:00:55 -06:00
David Gillingham
78c7f29096 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID 
queue.

Former-commit-id: cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08
 2012-03-07 16:05:54 -06:00
Bryan Kowal
c803afd454 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: 75cac6f9bf1dc237c4131e47912c595adb6aa0d7
 2012-03-07 10:22:40 -06:00
Bryan Kowal
793dad5711 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: a5229ac02bb3c7e177b26dae68902321c9de986c
 2012-03-05 13:46:10 -06:00
Bryan Kowal
94d6af30f0 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c
 2012-02-29 12:43:46 -06:00
Steve Harris
e5b56c99ab 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: fb9d0adece5806382d0aa5c7c3e7c41f89594143
 2012-02-27 15:58:49 -06:00
Bryan Kowal
c2cd292c32 Issue #202 - remove obsolete edex prefix verifications. 
Former-commit-id: 6984db8c852a552867b1b8159637d96dcd83ab5a
 2012-02-23 16:46:48 -06:00
Bryan Kowal
e135f4508d Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 10339dcba7c9ae535766e5c5dddac57ddb3f99c4
 2012-02-23 14:20:50 -06:00
Steve Harris
86e586befe 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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
 2012-02-23 12:38:55 -06:00
Steve Harris
7a10ca9766 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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
 2012-02-23 10:06:18 -06:00
Steve Harris
54be9660f1 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
 2012-02-22 11:14:43 -06:00
Steve Harris
9995d22e25 Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
 2012-02-22 10:12:49 -06:00
Steve Harris
496cc6a06b 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: 85082f273a85a3967d54d4a489b6ea973d0688be
 2012-02-20 16:38:06 -06:00
Steve Harris
5e9d2dd367 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: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
 2012-02-20 13:03:39 -06:00
Steve Harris
cc66c8be24 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client 
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
 2012-02-20 12:43:38 -06:00
Bryan Kowal
682c10767d Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. 
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
 2012-02-17 12:17:14 -06:00
Steve Harris
c1129dbd00 Merge branch '10-Tech_Blocked' into 104-integration 
Former-commit-id: 14c8ac5618aa04da5408a1d75297f3f9fa19d023
 2012-02-15 15:08:58 -06:00
Steve Harris
23cc9689de 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: 0c520ee63a42d53754686f52ffa5b94a0fe4eea1
 2012-02-15 14:39:43 -06:00
Steve Harris
1707b98721 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP 
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
 2012-02-15 14:34:47 -06:00
Steve Harris
a91b01bfbe Added the patch/bin directory and company to the installer.ldm for rpm builds 
Former-commit-id: ab787c94408e85afe2d92c3f860b7b9bd271c616
 2012-02-15 12:54:54 -06:00
Steve Harris
2e29bc8ee2 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
 2012-02-14 15:54:46 -06:00
Ben Steffensmeier
f65d86a06a 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: 518db101f2ec18afa31a5b12fbaab3bbb903013b
 2012-02-14 15:46:11 -06:00
Bryan Kowal
1855bbcbee Issue #202 - make edex-cots specs compatible with the branch. 
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
 2012-02-09 12:14:37 -06:00
Bryan Kowal
7d21e3149e Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups. 
Former-commit-id: 3038b2fc0d69236267db13eeb88e6f803cc6215a
 2012-01-30 16:05:17 -06:00
Bryan Kowal
2554090d0d Issue #202 - no longer build edex-ncep-nsharp for the ncep branch. 
Former-commit-id: bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462
 2012-01-30 16:01:45 -06:00
Jonathan Sanchez
4bce8e5ece Issue #19 Committed changes to Wes2Bridge branch. 
Former-commit-id: c0a860f692ba514f9ea7566fb0e3c00de05d8c92
 2012-01-24 10:20:28 -06:00