Commit graph

23 commits

Author SHA1 Message Date
Brad Gonzales
23ede5fa7b Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 3799026523 [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]
Former-commit-id: bef2bfa7cc
2012-06-22 15:08:40 -05:00
Bryan Kowal
ff0c86f857 Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]
Former-commit-id: 966c50ed06
2012-06-18 11:51:47 -05:00
Bryan Kowal
1ee59eac71 Merge branch '11-Collaboration' into development
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]
Former-commit-id: f0e3b957e3
2012-06-18 11:16:28 -05:00
Bryan Kowal
c608fc959c Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]
Former-commit-id: c0aaac4a07
2012-06-14 11:35:15 -05:00
Max Schenkelberg
e5e1a4de6a Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]
Former-commit-id: fceef3c5a1
2012-06-13 17:52:11 -05:00
Steve Harris
27b50c57bd Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 48860df690
2012-06-12 14:37:12 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
2012-06-08 13:39:48 -05:00
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
Max Schenkelberg
3ca8ca6f01 Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]
Former-commit-id: 1f5abc6e20
2012-05-09 15:02:30 -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
Bradley Gonzales
c345b2614e Issue #440 more descriptive login failure message
Former-commit-id: 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]
Former-commit-id: 74ce6f2140
2012-04-04 16:26:58 -05:00
Max Schenkelberg
e3477c90ae Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]
Former-commit-id: 753de872e0
2012-04-02 16:15:21 -05:00
James Korman
b29c262362 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]
Former-commit-id: d6003d1e71
2012-03-14 10:24:17 -05:00
Steve Harris
096ba6eb30 Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]
Former-commit-id: 46e1499e43
2012-02-23 13:16:35 -06:00
Steve Harris
a9b900821a removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]
Former-commit-id: ecb38ba165
2012-02-23 12:45:50 -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
Roger Ferrel
376f6868b6 Issue #181
Changes from January ncep_cave

Former-commit-id: 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]
Former-commit-id: fa42f2dc60
2012-01-26 09:26:07 -06:00
Bryan Kowal
90c33ef882 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]
Former-commit-id: cf4d56d0a0
2012-01-23 13:25:11 -06:00
Bryan Kowal
2a7b92ec91 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]
Former-commit-id: 2b5ee4b940
2012-01-20 11:37:38 -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
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