Commit graph

744 commits

Author SHA1 Message Date
Steve Harris
6dd6f0070a Removed extra files from 12.5.1-15
Former-commit-id: 9b993d3152 [formerly 288233a06c] [formerly 9b993d3152 [formerly 288233a06c] [formerly 9612d7e90c [formerly 3c367f4c3b2b2f5bc64b8eb43ed5eb66deda129f]]]
Former-commit-id: 9612d7e90c
Former-commit-id: d6a864c7b6 [formerly 76e3f566f4]
Former-commit-id: bfce1b5084
2012-06-11 16:18:26 -05:00
Steve Harris
ca0f3f5814 12.5.1-15 baseline
Former-commit-id: 0ca936807e [formerly d5c238de07] [formerly 0ca936807e [formerly d5c238de07] [formerly cee20d8656 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]
Former-commit-id: cee20d8656
Former-commit-id: 31d7649939 [formerly 7da9afe36a]
Former-commit-id: ad91dc8a2e
2012-06-11 16:02:30 -05:00
Matt Nash
c13ca2f81b issue #693 always allow to invite users after opening create session dialog
Former-commit-id: 179f2d7ffe [formerly 9f2d97fa68] [formerly 179f2d7ffe [formerly 9f2d97fa68] [formerly b78d86bf04 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]]
Former-commit-id: b78d86bf04
Former-commit-id: 4b5af450d1 [formerly 03ee9d8a90]
Former-commit-id: 3e54a2fd18
2012-06-11 15:34:49 -05:00
Steve Harris
c01b096242 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: c7024992a3 [formerly 37793c86b1] [formerly c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a [formerly cf3c768213]
Former-commit-id: 3dd5b84aa2
2012-06-11 15:24:03 -05:00
Matt Nash
3f528cbd85 Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: c3b17038f9 [formerly 73da2b1fe8] [formerly c3b17038f9 [formerly 73da2b1fe8] [formerly 022e982aae [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]]]
Former-commit-id: 022e982aae
Former-commit-id: 945b47e29e [formerly d5e3c97d98]
Former-commit-id: 3a82f9690b
2012-06-11 10:24:35 -05:00
Matt Nash
254b673be7 Issue #703 can change font size in sessions
Former-commit-id: 73ad806eb2 [formerly 9d187cc362] [formerly 73ad806eb2 [formerly 9d187cc362] [formerly 4b72bb3d8e [formerly 0e7af586cd96a21540263474f321bd224c45ad54]]]
Former-commit-id: 4b72bb3d8e
Former-commit-id: 11f07ec579 [formerly 4453a06f31]
Former-commit-id: 822bd01fd9
2012-06-11 10:23:45 -05:00
Matt Nash
e1d1dbe568 Issue #659 make fixes to float/dock
Former-commit-id: 5accda84c9 [formerly cc5c172a77] [formerly 5accda84c9 [formerly cc5c172a77] [formerly 1f54c2d09d [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: b55c763a34 [formerly ae53309d60]
Former-commit-id: 94bc675780
2012-06-11 10:21:40 -05:00
Nate Jensen
37af033b53 Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8

Former-commit-id: 1b03a14b23 [formerly db3027c0d6] [formerly 1b03a14b23 [formerly db3027c0d6] [formerly 14c2b1271e [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]]]
Former-commit-id: 14c2b1271e
Former-commit-id: 00d6ab7011 [formerly 680325f03c]
Former-commit-id: 29d5237dd5
2012-06-08 16:10:57 -05:00
Nate Jensen
413d929248 Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74

Former-commit-id: 8d741bc4a1 [formerly 05389dac56] [formerly 8d741bc4a1 [formerly 05389dac56] [formerly 28f779e7b9 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]]]
Former-commit-id: 28f779e7b9
Former-commit-id: d1f42605dd [formerly 0271c9762d]
Former-commit-id: 1b76e1c855
2012-06-08 15:15:03 -05:00
Steve Harris
39ff9954f8 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Max Schenkelberg
edf6b8eafb Issue #697 Made multiple editors display on single participant editor properly. Made participant editors more restrictive so they can not be attempted to be used by the perspective since they are perspective agnostic
Change-Id: I6605e82c428bda79162adaccea2808f197eba440

Former-commit-id: b6a93f9d41 [formerly 49fa818762] [formerly b6a93f9d41 [formerly 49fa818762] [formerly ef669a0297 [formerly 20e6ddde20749721784a80a4bb78736de1140a40]]]
Former-commit-id: ef669a0297
Former-commit-id: e01ed896d7 [formerly 8a19179310]
Former-commit-id: 6582ca4f5a
2012-06-07 18:22:01 -05:00
Max Schenkelberg
c5d730e1b8 Issue #697 Fixed recycling of grid vector resource, and made cursor change when drawing and only send clear_all if session leader
Change-Id: I78fbb17c7513e881ddf47d0bcd0ce8333e5740ff

Former-commit-id: 9d96a272ec [formerly e10ece6081] [formerly 9d96a272ec [formerly e10ece6081] [formerly 048484f689 [formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]]]
Former-commit-id: 048484f689
Former-commit-id: 6e55d73543 [formerly 7df41dbc88]
Former-commit-id: 8ef6ad5ad6
2012-06-07 10:25:03 -05:00
Max Schenkelberg
f3e91d1717 Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10

Former-commit-id: 0adccb8b12 [formerly 7d5d086fe1] [formerly 0adccb8b12 [formerly 7d5d086fe1] [formerly 6a0ed72e5e [formerly 695134c3139868d6e9ace9dca7757368e0bfa5ec]]]
Former-commit-id: 6a0ed72e5e
Former-commit-id: 57af7d8bdc [formerly 70461db99f]
Former-commit-id: 0eb6e89fb3
2012-06-07 09:44:40 -05:00
Max Schenkelberg
6b5e48d697 Issue #697 Added support for procedure loading which magically made swapping appear to work too
Change-Id: I86c69781514709df4c6a23bdabfb63a2c103a9ed

Former-commit-id: 492adb92ae [formerly e0b7693686] [formerly 492adb92ae [formerly e0b7693686] [formerly 0776af95e7 [formerly e1bf6a3b576da036478cd1415856a64ebc606640]]]
Former-commit-id: 0776af95e7
Former-commit-id: e682032d0c [formerly d5fd024fd6]
Former-commit-id: 04ab6c7c4e
2012-06-06 15:57:16 -05:00
Matt Nash
96372489d4 Issue #659 fix GFE issue with mouse handlers
Former-commit-id: 0e3b539ada [formerly c4d26f8b1b] [formerly 0e3b539ada [formerly c4d26f8b1b] [formerly ed0b70501f [formerly 43f277de57d148c2d742266d8346b9b93cbcb82f]]]
Former-commit-id: ed0b70501f
Former-commit-id: fef4b5d8af [formerly e99cd89281]
Former-commit-id: 3d8f99e127
2012-06-06 14:13:55 -05:00
Max Schenkelberg
7296fc3a91 Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35

Former-commit-id: 2750c4ba08 [formerly b8bedd1247] [formerly 2750c4ba08 [formerly b8bedd1247] [formerly fbd269f4c7 [formerly 6588f58c80782f793c3621a2fd7ec81be2d1ead2]]]
Former-commit-id: fbd269f4c7
Former-commit-id: 66f39cc77b [formerly 13bd18829f]
Former-commit-id: c6ebaebf1a
2012-06-06 12:05:47 -05:00
Bryan Kowal
89a427c142 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: 3478f30891 [formerly b8622629e3] [formerly 3478f30891 [formerly b8622629e3] [formerly c0db02e377 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]
Former-commit-id: c0db02e377
Former-commit-id: 733b34202f [formerly d92eb0c227]
Former-commit-id: 2b48d12f7c
2012-06-05 16:55:52 -05:00
Max Schenkelberg
4618dc9b94 Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard

Former-commit-id: f0e2ef8c91 [formerly b5da470e0a] [formerly f0e2ef8c91 [formerly b5da470e0a] [formerly 8b87b6a0a1 [formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]]
Former-commit-id: 8b87b6a0a1
Former-commit-id: af72c6411a [formerly a6ca2ee4f6]
Former-commit-id: 55949aef25
2012-06-05 16:43:27 -05:00
Brad Gonzales
b2874a182e Issue #639 fixed archive log view secondary id.
Former-commit-id: 9c099c7931 [formerly 40a0e03b2d] [formerly 9c099c7931 [formerly 40a0e03b2d] [formerly 67e225e341 [formerly 69c774abf417049ffc343ff8ba5d2e44d05bb2e7]]]
Former-commit-id: 67e225e341
Former-commit-id: b8d677faf0 [formerly 6be2a8435a]
Former-commit-id: 14bd74c9fa
2012-06-05 15:14:42 -05:00
Max Schenkelberg
58c5d00acd Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937

Former-commit-id: dbb8a6b93d [formerly 3cd4f75170] [formerly dbb8a6b93d [formerly 3cd4f75170] [formerly 85a7897b1e [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]]]
Former-commit-id: 85a7897b1e
Former-commit-id: a8e2e4c8c1 [formerly f5c8240c92]
Former-commit-id: 69b203439e
2012-06-05 13:44:48 -05:00
Matt Nash
d47328be4a Issue #659 toolbar is in session view now
Former-commit-id: 373db85359 [formerly 00f55c1d80] [formerly 373db85359 [formerly 00f55c1d80] [formerly e43fee4483 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]]
Former-commit-id: e43fee4483
Former-commit-id: f2d8da6b3d [formerly 304970e9a9]
Former-commit-id: 637cbca41c
2012-06-05 13:25:36 -05:00
Nate Jensen
590a40ac9f Issue #427 cleanup
Change-Id: Ieeb03e0f7457ee7dceb6241b61340e364b5aab48

Former-commit-id: 9d713d849c [formerly 7f6bc2df93] [formerly 9d713d849c [formerly 7f6bc2df93] [formerly 240dac19ba [formerly 49d468829654697d266a551452edf6a2de66edce]]]
Former-commit-id: 240dac19ba
Former-commit-id: dcfbaad52e [formerly 6557fe0688]
Former-commit-id: 03607065a5
2012-06-05 10:50:08 -05:00
Matt Nash
35b35a0696 Issue #642 fixing merge mistake
Former-commit-id: e27578206e [formerly 77d150bf6c] [formerly e27578206e [formerly 77d150bf6c] [formerly 4cc721ebf5 [formerly 2e699d0cd90d2f61ff211b601300ab17cf9c5a40]]]
Former-commit-id: 4cc721ebf5
Former-commit-id: 414845eda9 [formerly 7915f5edf2]
Former-commit-id: 4b139f6f81
2012-06-04 09:25:13 -05:00
Matt Nash
f94bff689f Issue #642 removing update code
Former-commit-id: 8f16eecde5 [formerly acc5d69e59] [formerly 8f16eecde5 [formerly acc5d69e59] [formerly 2935d69e4f [formerly 510ca9d1234dba1b4e76f05536fb24c7fd693a76]]]
Former-commit-id: 2935d69e4f
Former-commit-id: c3732cc601 [formerly 2a476c6ce8]
Former-commit-id: ca4c0baa6e
2012-06-04 09:13:23 -05:00
Matt Nash
258e64971b Issue #642 alert words now filter what directory is shown
Former-commit-id: e8355a9a2b [formerly 82cad97932] [formerly e8355a9a2b [formerly 82cad97932] [formerly c5509344e9 [formerly df7971ed32994f6ac52ac10fcb03945d57eb5872]]]
Former-commit-id: c5509344e9
Former-commit-id: 925c06ed36 [formerly b3a948cca6]
Former-commit-id: 3d3477a213
2012-06-04 07:33:30 -05:00
Brad Gonzales
0628482212 Issue #639 fixed the previouse and next selection listeners, and renamed an inner class in the SearchComposite.
Former-commit-id: 08ad661af4 [formerly 4135176198] [formerly 08ad661af4 [formerly 4135176198] [formerly b0794e5e55 [formerly 31b09e378571ce6f8b4a6bd99cfb49b3d8b51045]]]
Former-commit-id: b0794e5e55
Former-commit-id: 97602f8882 [formerly 52ae0ebb1a]
Former-commit-id: 0e0d82e3d0
2012-06-03 10:53:31 -05:00
Brad Gonzales
f106d74f0c Issue #639 adding new files missed in last commit
Former-commit-id: 00d014b2f2 [formerly 3795f90712] [formerly 00d014b2f2 [formerly 3795f90712] [formerly 4e7ce90c42 [formerly 26ada47164c9b004cff5e869735ee11655af6a40]]]
Former-commit-id: 4e7ce90c42
Former-commit-id: c4f46ca508 [formerly 48f639d9ac]
Former-commit-id: c7db897586
2012-06-01 18:20:24 -05:00
Brad Gonzales
03171ddda2 Issue #639 added view for collaboration chat logs. added search control for logs, sessions, and chats
Former-commit-id: d8c4230045 [formerly 78e44746d6] [formerly d8c4230045 [formerly 78e44746d6] [formerly 60276e49e8 [formerly e72e6741925cff7821816daf208cf2a1da5229ce]]]
Former-commit-id: 60276e49e8
Former-commit-id: 476aa27464 [formerly 66040f56b4]
Former-commit-id: 2955e85a78
2012-06-01 18:18:11 -05:00
Max Schenkelberg
1ae1285e5c Issue #664 fixed name vs id text for dam resource
Change-Id: I1fd50dde00cdf7fa35ba9eda93721d132a6dfbd5

Former-commit-id: 6bd5b967bf [formerly 5057c05529] [formerly 6bd5b967bf [formerly 5057c05529] [formerly 4dec649a97 [formerly a0481db7ccee2f656362ba63424af3c4aa49277b]]]
Former-commit-id: 4dec649a97
Former-commit-id: af62a3ef80 [formerly 8480dbbd75]
Former-commit-id: f5b7de2568
2012-06-01 14:36:44 -05:00
Max Schenkelberg
f6960e1738 Issue #664 Made hydro dam resource work with collaboration
Change-Id: If6d422a937a549c9f68b8c523553179924ac2d7a

Former-commit-id: b5d8d071de [formerly b0f729ceb2] [formerly b5d8d071de [formerly b0f729ceb2] [formerly 7b95887a24 [formerly a3bfc9f4014a417205c27bbd73fc07556df007bc]]]
Former-commit-id: 7b95887a24
Former-commit-id: cc74f57e1b [formerly 9c3805b762]
Former-commit-id: 1e45b28479
2012-06-01 14:21:55 -05:00
Max Schenkelberg
648b22f31b Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822

Former-commit-id: 1d9ccb6bd3 [formerly fde1e68df6] [formerly 1d9ccb6bd3 [formerly fde1e68df6] [formerly 052cc81223 [formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]]
Former-commit-id: 052cc81223
Former-commit-id: 86f03dfdc3 [formerly d4dcc0e12e]
Former-commit-id: e2ebc0fb30
2012-05-31 16:05:25 -05:00
Matt Nash
927b2967d7 Issue #659 float button for cool detachable functionality
Former-commit-id: 2b1ce9e674 [formerly 855193aa77] [formerly 2b1ce9e674 [formerly 855193aa77] [formerly cab515cbfd [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]]
Former-commit-id: cab515cbfd
Former-commit-id: 945095e345 [formerly 633fd997e5]
Former-commit-id: 22eb377b74
2012-05-30 16:13:21 -05:00
Matt Nash
02ab07f89a Issue #440 fixes in group view
Former-commit-id: 414c552462 [formerly ad3f6cd8ad] [formerly 414c552462 [formerly ad3f6cd8ad] [formerly 7065ea8107 [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]]]
Former-commit-id: 7065ea8107
Former-commit-id: dbcb9b7b87 [formerly 2f7a2747aa]
Former-commit-id: 77b210c155
2012-05-30 16:13:21 -05:00
Nate Jensen
3bbdc214e0 Merge "Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session"." into 11-Collaboration
Former-commit-id: 06970f4d82 [formerly 8eb5665591] [formerly 06970f4d82 [formerly 8eb5665591] [formerly ac95fde3e5 [formerly 34be3aaf6ea41ae8366d072723c3beb8151d1f84]]]
Former-commit-id: ac95fde3e5
Former-commit-id: 71d38a3598 [formerly d4ba003ce0]
Former-commit-id: e4e9a8b6ba
2012-05-29 17:23:56 -05:00
Max Schenkelberg
6739195793 Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73

Former-commit-id: 71fe0a468a [formerly 1934bfa28c] [formerly 71fe0a468a [formerly 1934bfa28c] [formerly 76e99b4037 [formerly 2be9620b338140fa27efba037d0cc321558bec62]]]
Former-commit-id: 76e99b4037
Former-commit-id: 4c65ff8c20 [formerly 8f377d3fb8]
Former-commit-id: 01a1c14349
2012-05-29 15:15:05 -05:00
Max Schenkelberg
925845cff9 Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9

Former-commit-id: fe9de50746 [formerly 34a71dbee8] [formerly fe9de50746 [formerly 34a71dbee8] [formerly c28a586d84 [formerly 18ca6f058d810781d93ea2d0bad9b2daa161fa3a]]]
Former-commit-id: c28a586d84
Former-commit-id: ddfb7e038a [formerly 2cde39bc63]
Former-commit-id: e3ad085501
2012-05-29 15:00:42 -05:00
Bryan Kowal
584d3c0319 Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session".
Change-Id: Ie7e419bc47a2451eef5a25456fa767fc0156cc27

Former-commit-id: af04bfc6d8 [formerly 14386ad818] [formerly af04bfc6d8 [formerly 14386ad818] [formerly 25b2361923 [formerly 904a05e94386bd9d71a357e374ed3c757dc08016]]]
Former-commit-id: 25b2361923
Former-commit-id: 961d5976d1 [formerly 0692230344]
Former-commit-id: 27cd0fe325
2012-05-29 13:06:36 -05:00
Max Schenkelberg
efa296956a Issue #663 Removed references from ISerializableObject file
Former-commit-id: d071f7ea11 [formerly 76db032da7] [formerly d071f7ea11 [formerly 76db032da7] [formerly fec288d4bd [formerly 95da08aeabcc06f5ab46963cf4be4fb54457ff43]]]
Former-commit-id: fec288d4bd
Former-commit-id: 643c262998 [formerly 5e8f886155]
Former-commit-id: fbc5c4cfda
2012-05-29 09:10:48 -05:00
Max Schenkelberg
761ea9a414 Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5

Former-commit-id: 04c9f3a1c8 [formerly 8c9c33ef9f] [formerly 04c9f3a1c8 [formerly 8c9c33ef9f] [formerly 2058b7f0ea [formerly 5c240b5224ee93a36c5e05ddb15b373645222081]]]
Former-commit-id: 2058b7f0ea
Former-commit-id: ea408d8f42 [formerly 11cb7bafb0]
Former-commit-id: 0222587b96
2012-05-25 16:28:53 -05:00
Max Schenkelberg
6e5e2b500e Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b

Former-commit-id: f7183f8212 [formerly 7bae56e8b5] [formerly f7183f8212 [formerly 7bae56e8b5] [formerly 854f41eb7f [formerly 209d658e61d7b595d4effbfb87f65b87a5f196a9]]]
Former-commit-id: 854f41eb7f
Former-commit-id: e4350ca0ae [formerly d380895c56]
Former-commit-id: 079a247ee5
2012-05-25 15:24:18 -05:00
Max Schenkelberg
b12e6a3add Issue #663 Fixed clearing of display in D2D, resources can now be specified to be readded when unloaded during a session
Change-Id: I77b448ad4af60bf8d1afb3b50a5575ad82c4ae22

Former-commit-id: 2838c08685 [formerly 8773dbdf62] [formerly 2838c08685 [formerly 8773dbdf62] [formerly f6f2e1a4fb [formerly d15821c57b49090863e9c22455d06c94da6fcaf9]]]
Former-commit-id: f6f2e1a4fb
Former-commit-id: c2c035a2e0 [formerly dec7ce3551]
Former-commit-id: 8fd526dcf3
2012-05-25 14:37:25 -05:00
Bryan Kowal
e5fd40d59e 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: 8ee68911fb [formerly a808bc245f] [formerly 8ee68911fb [formerly a808bc245f] [formerly 0f0bab6e54 [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: b817484c67 [formerly 0211167d87]
Former-commit-id: e7f2ec38b5
2012-05-24 16:51:35 -05:00
David Gillingham
7af4c62015 Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.

Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e

Former-commit-id: ff34c58b1b [formerly 09dcd35e4a] [formerly ff34c58b1b [formerly 09dcd35e4a] [formerly db75f1860b [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]]
Former-commit-id: db75f1860b
Former-commit-id: f1343b9a6e [formerly 6efe780ad6]
Former-commit-id: be3b7a994f
2012-05-24 14:54:17 -05:00
David Gillingham
bba1f5d494 Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.

Former-commit-id: 855745db06 [formerly 95e1582a22] [formerly 855745db06 [formerly 95e1582a22] [formerly 34303477ac [formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]]
Former-commit-id: 34303477ac
Former-commit-id: 031558955d [formerly 9dabcca4f8]
Former-commit-id: 1e4fd039ef
2012-05-23 15:49:49 -05:00
Max Schenkelberg
e80b6c8dce Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f

Former-commit-id: c98b6e28c7 [formerly ae8236aa21] [formerly c98b6e28c7 [formerly ae8236aa21] [formerly 1c11323103 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]]]
Former-commit-id: 1c11323103
Former-commit-id: d0d619b048 [formerly 696c2f4894]
Former-commit-id: f2bd302796
2012-05-23 09:14:21 -05:00
Max Schenkelberg
2d9ccfe9ce Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5

Former-commit-id: 4c0a18894c [formerly e81a9ee935] [formerly 4c0a18894c [formerly e81a9ee935] [formerly 52a78af98c [formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]]]
Former-commit-id: 52a78af98c
Former-commit-id: da46b6efc0 [formerly 7b7e708092]
Former-commit-id: 4e9971aac6
2012-05-22 09:56:27 -05:00
Steve Harris
ee7b53c7c4 12.5.1-9 baseline
Former-commit-id: b8de76b45e [formerly 8f3c9ebfb7] [formerly b8de76b45e [formerly 8f3c9ebfb7] [formerly 1f542697cb [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]
Former-commit-id: 1f542697cb
Former-commit-id: d23b0e4d60 [formerly ce0422a34a]
Former-commit-id: 399c00d295
2012-05-21 17:48:55 -05:00
David Gillingham
2326b069c7 Issue #649: Make compression of archived Java objects optional.
Former-commit-id: 513d0e6280 [formerly 05a58dadf1] [formerly 513d0e6280 [formerly 05a58dadf1] [formerly 28bdf26f2e [formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]]]
Former-commit-id: 28bdf26f2e
Former-commit-id: f58f89dce7 [formerly f5fe7e6be7]
Former-commit-id: 6fe5d0cdaf
2012-05-21 16:48:02 -05:00
Max Schenkelberg
501783794b Issue #239 Cleaned up DispatchingWireframeShape code to send world coordinates separate from pixel coordinates
Change-Id: I1c7eb9b19ea8d816eb3e81901ecf5574877a5212

Former-commit-id: 950f857a5f [formerly 9c1f14a0a6] [formerly 950f857a5f [formerly 9c1f14a0a6] [formerly 2bc9a18957 [formerly 0a3d69b5bb8ca31d8db8148225f7e1ef85778919]]]
Former-commit-id: 2bc9a18957
Former-commit-id: 49f1572bc5 [formerly 084511ab6a]
Former-commit-id: 7a65366028
2012-05-21 14:57:37 -05:00
David Gillingham
99b80900e4 Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.

Change-Id: I3689e003e367be2b69033f13f1744c381d597616

Former-commit-id: 32799c46d2 [formerly 94a4cbd107] [formerly 32799c46d2 [formerly 94a4cbd107] [formerly 7c84c67c67 [formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]]
Former-commit-id: 7c84c67c67
Former-commit-id: f3ac7a8090 [formerly 8d877d7784]
Former-commit-id: e048d60ff7
2012-05-21 13:10:10 -05:00