Commit graph

16 commits

Author SHA1 Message Date
Bryan Kowal
3149e73d76 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: 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]
Former-commit-id: a808bc245f
Former-commit-id: 8ee68911fb
2012-05-24 16:51:35 -05:00
Max Schenkelberg
82298cb03b Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 78e1bd2c62
Former-commit-id: 06ee0bbf6f
2012-05-09 15:02:30 -05:00
Steve Harris
bcc12e03ed 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: 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 27bc369818
Former-commit-id: 572e1bb476
2012-05-09 13:14:00 -05:00
Steve Harris
7fa9dbd5fb 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Bradley Gonzales
9d44aabf06 Issue #440 more descriptive login failure message
Former-commit-id: 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]
Former-commit-id: 6fc14461ee
Former-commit-id: 391f8e4d58
2012-04-04 16:26:58 -05:00
Max Schenkelberg
0b1caa67df Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]
Former-commit-id: 23d65caf2e
Former-commit-id: c56707c6bc
2012-04-02 16:15:21 -05:00
James Korman
4756721ef6 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: d6003d1e71 [formerly 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]
Former-commit-id: 095ab0eeab
Former-commit-id: ee20250305
2012-03-14 10:24:17 -05:00
Steve Harris
55b44a00db Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 46e1499e43 [formerly f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]
Former-commit-id: f9baa1c98c
Former-commit-id: 608a0c17a0
2012-02-23 13:16:35 -06:00
Steve Harris
2f8260ccbc removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]
Former-commit-id: c502603907
Former-commit-id: 07ac42866c
2012-02-23 12:45:50 -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: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Roger Ferrel
aa10b2f656 Issue #181
Changes from January ncep_cave

Former-commit-id: fa42f2dc60 [formerly 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]
Former-commit-id: 7427aeaf29
Former-commit-id: ae0981ac0f
2012-01-26 09:26:07 -06:00
Bryan Kowal
c1d930b119 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]
Former-commit-id: 5039d66b12
Former-commit-id: be0b6a87eb
2012-01-23 13:25:11 -06:00
Bryan Kowal
28957b7118 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]
Former-commit-id: 2142afe3f1
Former-commit-id: 971bf802ac
2012-01-20 11:37:38 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00