Commit graph

36 commits

Author SHA1 Message Date
Bryan Kowal
0211167d87 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: a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]
Former-commit-id: 0f0bab6e54
2012-05-24 16:51:35 -05:00
Bryan Kowal
f7cba22ee2 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: ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]
Former-commit-id: fbb694b48e
2012-05-10 09:24:56 -05:00
Steve Harris
63ea8599d7 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: 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 58037cb5d1
2012-05-09 13:14:00 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Bryan Kowal
62e4e0bbea 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: fadb50446d [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]
Former-commit-id: 298ab2e057
2012-04-16 17:00:30 -05:00
Bryan Kowal
4dec6ced9f Issue #450 - add the cave viz collaboration rpm to the yum groups.
Former-commit-id: 58b10dd9ae [formerly 56612b7cd64e16aa7af358ca251679a76781e36a]
Former-commit-id: 25c3f269bf
2012-04-11 10:28:30 -05:00
Steve Harris
ce3b74c605 12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
6884520750 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]
Former-commit-id: a0abcf8120
2012-03-29 10:03:05 -05:00
David Gillingham
2b5588bd1e Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]
Former-commit-id: d433b7d4d6
2012-03-13 12:31:38 -05:00
Bryan Kowal
638d2c964b Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]
Former-commit-id: b871752e3a
2012-03-08 09:00:55 -06:00
David Gillingham
8a86e910aa Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]
Former-commit-id: 78c7f29096
2012-03-07 16:05:54 -06:00
Bryan Kowal
033a4e237b 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: 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]
Former-commit-id: c803afd454
2012-03-07 10:22:40 -06:00
Bryan Kowal
81f778e43a Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 5228de77e2 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]
Former-commit-id: 793dad5711
2012-03-05 13:46:10 -06:00
Bryan Kowal
49a30a5b1a Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]
Former-commit-id: c2cd292c32
2012-02-23 16:46:48 -06:00
Bryan Kowal
5c86773a77 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]
Former-commit-id: e135f4508d
2012-02-23 14:20:50 -06:00
Steve Harris
938dc5b21c 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: dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]
Former-commit-id: 86e586befe
2012-02-23 12:38:55 -06:00
Steve Harris
3d511fe719 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: d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: 7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
4450cf8963 Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: 54be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
33483f3960 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: cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]
Former-commit-id: 5e9d2dd367
2012-02-20 13:03:39 -06:00
Steve Harris
54b5b6baef Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]
Former-commit-id: cc66c8be24
2012-02-20 12:43:38 -06:00
Bryan Kowal
2ba23624b4 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 682c10767d
2012-02-17 12:17:14 -06:00
Steve Harris
ad402655f4 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 272ba87883 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]
Former-commit-id: c1129dbd00
2012-02-15 15:08:58 -06:00
Steve Harris
a2e3aabc60 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: b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: 23cc9689de
2012-02-15 14:39:43 -06:00
Steve Harris
db1e3b1215 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]
Former-commit-id: 1707b98721
2012-02-15 14:34:47 -06:00
Steve Harris
39b13d7102 Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: a91b01bfbe
2012-02-15 12:54:54 -06:00
Steve Harris
cb3371ee28 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]
Former-commit-id: 2e29bc8ee2
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
d00572c122 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: 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]
Former-commit-id: f65d86a06a
2012-02-14 15:46:11 -06:00
Bryan Kowal
27c4557e0a Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 7ca62dc7d6 [formerly 26243249e27ee347933748aa53e9436e32751d9c]
Former-commit-id: 1855bbcbee
2012-02-09 12:14:37 -06:00
Bryan Kowal
e9d85fc09c Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 40c0e93995 [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]
Former-commit-id: 7d21e3149e
2012-01-30 16:05:17 -06:00
Bryan Kowal
2745f9cac7 Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 998337f9f4 [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]
Former-commit-id: 2554090d0d
2012-01-30 16:01:45 -06:00
Bryan Kowal
7f1b468010 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]
Former-commit-id: ea1c82452b
2012-01-20 13:38:00 -06:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
Bryan Kowal
06187b93be Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]
Former-commit-id: 9d64e1df12
2012-01-18 16:00:45 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00