Commit graph

57 commits

Author SHA1 Message Date
Nate Jensen
8d94771854 Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 37d4401747 [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2801c4fdfb
2012-03-22 09:39:59 -05:00
James Korman
d0976e4703 Issue #232 - Delete files from original locations
Former-commit-id: 4dabfd8c2a [formerly 90b74b258a] [formerly 55f269100c [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]
Former-commit-id: 55f269100c
Former-commit-id: 9badd0fb07
2012-03-20 14:55:27 -05:00
James Korman
8be6351348 Issue #232 - Considerable refactoring/event processing
Former-commit-id: 60ff4d139b [formerly 4ba4ccb404] [formerly cc5cc2d409 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]
Former-commit-id: cc5cc2d409
Former-commit-id: c5e9df26c1
2012-03-20 13:59:55 -05:00
Roger Ferrel
002e7eab3f Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687

Former-commit-id: ce3b5728c5 [formerly 1f4edd08e4] [formerly a7f1fc18b1 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]
Former-commit-id: a7f1fc18b1
Former-commit-id: 9f6642d572
2012-03-20 10:42:57 -05:00
Nate Jensen
77a50a5e25 Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: feeb8cba7e [formerly 8f8e690470] [formerly dc62171533 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]
Former-commit-id: dc62171533
Former-commit-id: 8d78571942
2012-03-14 11:23:55 -05:00
Matt Nash
d6ef74a95b Issue #244 icons and login changes
Former-commit-id: f5c9cfd285 [formerly e06101f9c3] [formerly 2fd6e28569 [formerly ef2993a8545265adbc325080765baef0ee939923]]
Former-commit-id: 2fd6e28569
Former-commit-id: 5b949aeacf
2012-03-14 10:54:13 -05:00
James Korman
578594cdfd Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: ee20250305 [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]
Former-commit-id: d6003d1e71
Former-commit-id: b29c262362
2012-03-14 10:24:17 -05:00
Roger Ferrel
a64f2e6070 Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: 186aac5b77 [formerly 97a3884017] [formerly c321d2aacf [formerly 486b2186014a14a845e48dac222c293a7891e39e]]
Former-commit-id: c321d2aacf
Former-commit-id: b21f1555e2
2012-03-14 09:26:23 -05:00
Matt Nash
c743c0c44b Issue #244 new icons for collaboration
Former-commit-id: 6398c01aec [formerly 79f1cbec74] [formerly 39bce3d793 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]
Former-commit-id: 39bce3d793
Former-commit-id: 22eb44eb26
2012-03-12 08:03:54 -05:00
Roger Ferrel
e8887a6189 Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: 1871be89e7 [formerly be9fe19d9a] [formerly d17ef23899 [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]
Former-commit-id: d17ef23899
Former-commit-id: 6c8db0d6a4
2012-03-08 17:16:48 -06:00
Roger Ferrel
d6a4919b9a Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: 71a5524380 [formerly f492b082dc] [formerly f04f775a66 [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]
Former-commit-id: f04f775a66
Former-commit-id: 674cc116b2
2012-03-08 12:37:56 -06:00
Matt Nash
b4a5aaea11 Issue #244 added work on the chat for presence notifications
Former-commit-id: c96c33169b [formerly d264743199] [formerly 6f354374d6 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]
Former-commit-id: 6f354374d6
Former-commit-id: 4f35191a6b
2012-03-08 09:08:41 -06:00
Matt Nash
dd57ff6b7f Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: 1e4472cd78 [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]
Former-commit-id: bbacd337b4
Former-commit-id: 7efd993e18
2012-03-08 08:33:32 -06:00
Roger Ferrel
40b910c05e Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: c22d5ef573 [formerly c9459e2e8c] [formerly 2114b95a0b [formerly 28969960d80066def0ef02930875e40d7693c234]]
Former-commit-id: 2114b95a0b
Former-commit-id: 1a2608a2fa
2012-03-08 08:30:02 -06:00
James Korman
f242c1a430 Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 4368616970 [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]
Former-commit-id: 5a91d71c12
Former-commit-id: 2fea86a591
2012-03-07 15:38:20 -06:00
Nate Jensen
39f89588a1 Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: 13228ab7cc [formerly f950b30463] [formerly 412ceb9561 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]
Former-commit-id: 412ceb9561
Former-commit-id: d0672cf2b6
2012-03-06 14:27:15 -06:00
Roger Ferrel
0cf600a16c Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: c62418dcf3 [formerly c26e98376e] [formerly 3161380f4d [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]
Former-commit-id: 3161380f4d
Former-commit-id: ccfadae952
2012-03-06 14:08:39 -06:00
Steve Harris
1a6195da8b Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: 45e43fa592 [formerly 7817380140] [formerly fb9896b8c9 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]]
Former-commit-id: fb9896b8c9
Former-commit-id: c1e626d256
2012-02-28 09:55:05 -06:00
Steve Harris
d83100c3df removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 07ac42866c [formerly c502603907] [formerly ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]
Former-commit-id: ecb38ba165
Former-commit-id: a9b900821a
2012-02-23 12:45:50 -06:00
Steve Harris
1954443885 Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 7966ab9369 [formerly 6f7f678590] [formerly 830038b0c6 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]
Former-commit-id: 830038b0c6
Former-commit-id: 5f6715ed05
2012-02-23 07:53:15 -06:00
Bryan Kowal
53f4674f25 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 0f02d05283 [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]
Former-commit-id: cd35220cf7
Former-commit-id: 5ca7ce8373
2012-02-22 17:07:15 -06:00
Steve Harris
83618ae62b creating OB12.2.1 from ss_sync for testing
Former-commit-id: 4ff546d3fd [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: aaf2fbd05b
2012-02-22 13:06:47 -06:00
Steve Harris
b55a488ed8 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
d879ca2f3f Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added

Former-commit-id: 0d2bd27a08 [formerly eca4aef9a8] [formerly e5a5b3eefa [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]]
Former-commit-id: e5a5b3eefa
Former-commit-id: ff6c744fa7
2012-02-20 14:02:14 -06:00
Bryan Kowal
cc8c6597a2 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
2012-02-17 12:17:14 -06:00
Steve Harris
1ac6b36d1f Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Steve Harris
de85613a99 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 1707b98721
Former-commit-id: db1e3b1215
2012-02-15 14:34:47 -06:00
Steve Harris
98b223d08e Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]
Former-commit-id: a91b01bfbe
Former-commit-id: 39b13d7102
2012-02-15 12:54:54 -06:00
Steve Harris
c2603de1b8 Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: ece695a374 [formerly 4eef9c3c20] [formerly 35cc62582b [formerly e019344c6f96c6db35ede5985779eab537df523c]]
Former-commit-id: 35cc62582b
Former-commit-id: a6b95a2e81
2012-02-08 09:09:28 -06:00
Matt Nash
203ec03a08 Issue #192 gitignore changes
Former-commit-id: 7d36323ae9 [formerly 5fdadf4333] [formerly 426da850d3 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]]
Former-commit-id: 426da850d3
Former-commit-id: 380179f10d
2012-02-03 15:03:21 -06:00
Nate Jensen
7afc75204c Merge "Issue #181 disable nctext-ingest" into 14-NCEP
Former-commit-id: da5bc7b50f [formerly 7490a7d0ed] [formerly e4dc370101 [formerly 0d01c3c0597e1be074d13c3a3e6ce188878e220f]]
Former-commit-id: e4dc370101
Former-commit-id: 0b6bde1664
2012-01-31 09:51:16 -06:00
Nate Jensen
6bdb96c7ca Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: e61ff490b1 [formerly 1b32446288] [formerly f3ba2258df [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]
Former-commit-id: f3ba2258df
Former-commit-id: 50e735ce0c
2012-01-31 09:45:27 -06:00
Steve Harris
f0bbc94a6c Merge "Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups." into 14-NCEP
Former-commit-id: 40d4ed8433 [formerly 2cd9e2af22] [formerly 801f50b944 [formerly 20c2f61be3e070a0223a94196ff91397de184d42]]
Former-commit-id: 801f50b944
Former-commit-id: 9587218b75
2012-01-30 16:12:23 -06:00
Steve Harris
9cde064bb1 Merge "Issue #202 - no longer build edex-ncep-nsharp for the ncep branch." into 14-NCEP
Former-commit-id: 7ae33d70c4 [formerly 028bc69fbb] [formerly 5216f0ff9e [formerly 0eb4e14fe793e94be2390693c2c06c29547d48a1]]
Former-commit-id: 5216f0ff9e
Former-commit-id: 05a088f9d1
2012-01-30 16:12:03 -06:00
Bryan Kowal
e17a1e06a7 Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 00c0ab406b [formerly 40c0e93995] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]]
Former-commit-id: 7d21e3149e
Former-commit-id: e9d85fc09c
2012-01-30 16:05:17 -06:00
Bryan Kowal
b271da085c Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: b6a8534258 [formerly 998337f9f4] [formerly 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]
Former-commit-id: 2554090d0d
Former-commit-id: 2745f9cac7
2012-01-30 16:01:45 -06:00
Nate Jensen
121a29bdd1 Issue #181 fix ncep edex rpms
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: 769731f21b [formerly 0301af999e] [formerly 50c6816fa9 [formerly 17f8151b148ad8d645c81760bfa4820dc421490a]]
Former-commit-id: 50c6816fa9
Former-commit-id: ab7f9e5a56
2012-01-30 15:56:50 -06:00
Bryan Kowal
ee70b7909c Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: c8dde3b1f6 [formerly f0b31d25f6] [formerly 71d08b6916 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]]
Former-commit-id: 71d08b6916
Former-commit-id: 1f254d0e0f
2012-01-26 17:38:17 -06:00
Nate Jensen
637a516ae5 Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: f3875948e8 [formerly ca923b9475] [formerly 15e0a5e68d [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]
Former-commit-id: 15e0a5e68d
Former-commit-id: 29be9b82bd
2012-01-26 17:28:06 -06:00
Nate Jensen
710bcd1d8d Issue #181 fix empty src dirs
Change-Id: If03015cf64f5791b4f5b340cc6aba4514a6a6d43

Former-commit-id: 3c2701dd43 [formerly 6fabe216d8] [formerly 638f900d41 [formerly 25ad3a67efb293afc2bf3ef9442ff2fc296bef18]]
Former-commit-id: 638f900d41
Former-commit-id: 18540298b4
2012-01-26 15:42:55 -06:00
Roger Ferrel
49dfa99cc5 Issue #181
Added files to index.


Former-commit-id: e3d3629375 [formerly cf1383a412] [formerly beae8e7e59 [formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]]
Former-commit-id: beae8e7e59
Former-commit-id: e1fc0b48c1
2012-01-26 15:05:25 -06:00
Roger Ferrel
2be2e8478f Issue #181
new files not indexed


Former-commit-id: 732004d9cd [formerly 472e788dba] [formerly 69f8daedff [formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]
Former-commit-id: 69f8daedff
Former-commit-id: c6f2b90560
2012-01-26 14:37:19 -06:00
Roger Ferrel
9ed05c45c0 Issue #181
The January ncep_build/build.cave changes

Former-commit-id: c5f7cfb665 [formerly f00f3dd332] [formerly 750b17a81c [formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]]
Former-commit-id: 750b17a81c
Former-commit-id: cbd8827872
2012-01-26 11:25:39 -06:00
Roger Ferrel
9475b22c54 Issue #181
Changes from January ncep_cave

Former-commit-id: ae0981ac0f [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]
Former-commit-id: fa42f2dc60
Former-commit-id: 376f6868b6
2012-01-26 09:26:07 -06:00
Matt Nash
ec87ab4e3e Issue #192 remove cave directory from tools for ss_sync!!!!
Former-commit-id: 752ff42041 [formerly 58f737b91d] [formerly 7f60d8ef33 [formerly d1b8d74e4773ff4385304ca846a6f5c4fefec3c3]]
Former-commit-id: 7f60d8ef33
Former-commit-id: c19737f31d
2012-01-25 11:12:57 -06:00
Matt Nash
8735351967 Issue #192 remove cave directory under tools for 11
Former-commit-id: 82e27e00d1 [formerly 243bf2ac7c] [formerly 6b938ecbff [formerly a33e474e675224f9eaeed64245c40e7b149b50ea]]
Former-commit-id: 6b938ecbff
Former-commit-id: 0020fbeab7
2012-01-25 09:34:51 -06:00
Nate Jensen
6b4ab6c0e6 Issue #181 fix ncep mistake
Change-Id: Ic86240830412ab530dae6a8d0003149c8eb034f8

Former-commit-id: 24f90ed13d [formerly 8299f30726] [formerly 94aab854ae [formerly f4e8cf7df44f7935dbce427b8f977d609572fa25]]
Former-commit-id: 94aab854ae
Former-commit-id: f12bd97443
2012-01-24 15:01:13 -06:00
Nate Jensen
802607c79f Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: fae8fd5a6d [formerly 8e3730adbf] [formerly 1dabb12dce [formerly 0c82def5c753aab240848aac8dc906a161461ac3]]
Former-commit-id: 1dabb12dce
Former-commit-id: 9c4ad58867
2012-01-24 12:15:01 -06:00
Nate Jensen
7301ad5c66 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: 6366bc35cb [formerly fe52a35f7a] [formerly 33756de9c8 [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]
Former-commit-id: 33756de9c8
Former-commit-id: 3b7a082f41
2012-01-24 09:59:50 -06:00