BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,211 Commits 13 Branches 260 Tags 1.1 GiB
8c759146ab
Commit Graph

337 Commits

Author SHA1 Message Date
Leif Jackson
8528b2d287 Merge commit 'bbb/master' 2010-07-14 02:53:29 +00:00
Richard Alam
ec256e7cb7 - upgrading versions from 0.64 to 0.7 2010-07-13 09:42:13 -04:00
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00:00
Leif Jackson
75dd3b6fd6 Created HeartbeatMonitor Event Observer. Will reconnect to Freeswitch if the switch is restared...etc. TODO: There should be some intergration between the bbb-voice object and the Monitor via the webconference framework To allow for kick all, then warn that FS is not available right now - Could also be extended to use the stats in the Heartbeat such as Idle-CPU, Session-Count, Core-UUID to impement cluster/lb of FS servers 2010-07-01 05:44:46 +00:00
Richard Alam
2c98d5c5e4 - add README 2010-06-30 11:59:58 -04:00
Richard Alam
ca975a9778 - remove IDE specific files 2010-06-30 11:58:57 -04:00
Leif Jackson
c2e97c4b60 NPE exception in Action event handler 2010-06-29 06:58:40 +00:00
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
deniszgonjanin
13790e0bbb Fix for several 0.7 release bugs, as well as a new way for modules to receive updates about users joining and leaving 2010-06-24 07:42:16 +00:00
Richard Alam
b880bbca36 - add files and directories to .gitignore 
- fix problem where webcam icon stays disabled when webcam is closed
 2010-05-31 10:36:15 -04:00
BigBlueButton
e4fd72681a - adding .gitignore 2010-05-30 03:55:46 +00:00
Richard Alam
33d63c1cb7 - add externUserID to participant 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4327 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 19:26:31 +00:00
Denis Zgonjanin
40c81337e3 Corrected small bug in whiteboard optimization algorithm 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4302 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 16:32:12 +00:00
Denis Zgonjanin
f00f568200 Optimization for whiteboard freehand shapes. Removed unnecessary data points. This improves bandwidth usage, and doesn't choke Flash Player as much when there are a lot of shapes drawn on the same page. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4301 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 16:27:12 +00:00
Jeremy Thomerson
aeaa9dd19d fix classpath issue (another reason these eclipse files shouldn't be committed into svn) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4274 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 23:34:15 +00:00
Jeremy Thomerson
c737c7e7f8 add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4272 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 21:53:52 +00:00
Denis Zgonjanin
c7ee585301 Fixed Issue 502 - server side 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4265 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 17:44:33 +00:00
Denis Zgonjanin
3c30a4075a Whiteboard red5 server side application 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4235 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-03 12:16:43 +00:00
Richard Alam
6ba909804e - change repo dir to /home/firstuser/dev/repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4078 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-31 14:39:14 +00:00
Richard Alam
8741d474b5 - upgrade to red5-0.9.1 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4050 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 18:18:31 +00:00
Richard Alam
05eec810bf - remove presentation properly: When the current presentation is removed, clear the presentation window 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3922 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-17 20:37:44 +00:00
Richard Alam
0dc56303fd - fix so that latecomers would have access to the presentations uploaded before they joined. Currently, when a 
presentation get uploaded, then a late participant joins and becomes presenter, he/she cannot switch or load a
previously uploaded presentation

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3918 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-16 20:30:20 +00:00
Jeremy Thomerson
55589f9ca0 end meeting API call now kicks everyone from the conference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3867 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 23:33:25 +00:00
Jeremy Thomerson
ac17421e6c work on end meeting API call (issue #394) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3864 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 19:29:59 +00:00
Jeremy Thomerson
500604eb55 getMeetingInfo API call working 
now just need to add more information to it


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 23:59:02 +00:00
Jeremy Thomerson
895ff7d53b spring integration using full-on objects now 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3793 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 21:51:43 +00:00
Jeremy Thomerson
827a65b647 move some common classes to bbb-common-message for spring integration changes 
This commit simply moves a few of the classes to bbb-common-message and makes all of the related build changes to support this change.
No functionality was changed (at least intentionally).

Next step is to change the current Spring Integration messages (conference started / stopped) to send the whole conference in the message and confirm that this is working as intended.  Then it's easy to add other API calls


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3791 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 20:51:29 +00:00
Jeremy Thomerson
1aec508ef4 adding common messaging jar to classpath 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3784 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:30:32 +00:00
Richard Alam
a45d7104f1 - modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3783 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:16:42 +00:00
Richard Alam
f2d24be6f3 - modify build.gradle to pull in bbb-common-message from local repo 
- setup scala (Not used for now)

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3780 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 16:34:16 +00:00
Richard Alam
ac3d302727 - upgrade to Red5 0.9 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3743 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-19 18:13:23 +00:00
Richard Alam
c165308edb - mute/unmute all except those participants marked as locked. If participant is locked, it will keep it's status as muted or unmuted while the others will be muted/unmuted as requested. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3692 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-10 13:48:40 +00:00
Richard Alam
8ae5e7ab59 merge in latest from SVN and fix classpaths 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3681 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 18:34:55 +00:00
Richard Alam
14da2aa65b - don't create recoding file 
- remove recording for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3623 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-04 15:14:17 +00:00
Richard Alam
95b1d5567e - add more comment so we don't have to update the wiki 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3443 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-22 21:53:24 +00:00
Richard Alam
d9661be9a3 - latecomers should be able to sync there slide with the presenter's 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3321 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-17 16:51:13 +00:00
Richard Alam
34fbff77d1 - handle new message from bbb-web and send to client 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3168 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-31 19:47:05 +00:00
DJP
6d14ff08db presentation file error handling : new message code depending on specific error 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3114 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-17 23:08:17 +00:00
DJP
e0ff381156 Added error handling on presentation module to be compatible with i18n string generation by Flash client 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3107 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-15 20:45:42 +00:00
Richard Alam
f970b70513 - rename classes 
- modify so that to set which app to use, you need to only modify bigbluebutton.properties
by setting asterisk.application=konference or asterisk.application=meetme

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3102 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-15 17:38:28 +00:00
Richard Alam
1ab69215fe - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3081 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 21:51:09 +00:00
Richard Alam
12eff569b9 - fix problem where when a second participant joins in, she sees the first participant as muted 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3080 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 21:47:10 +00:00
Richard Alam
8b92d6c9a7 - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3079 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 20:16:59 +00:00
Richard Alam
b73c85b604 - add some instructions on how to configure voice conf app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3075 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 19:00:14 +00:00
Richard Alam
81457e0231 - use spring integration on wiring some of the beans 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3073 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-06 04:38:22 +00:00
Richard Alam
4c324b9f41 - make appkonference as default conference app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3072 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-06 00:37:50 +00:00
Richard Alam
3714ee2807 - add headers 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3071 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-05 23:04:35 +00:00
Richard Alam
11e8ba68fb - try setting up for spring integration 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3069 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 23:15:38 +00:00
Richard Alam
275bb52119 - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3068 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 22:51:19 +00:00
Richard Alam
ab672bd438 - meetme now works except talker updates 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3067 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 22:48:33 +00:00
Richard Alam
0372092bec - meetme now works except talker updates 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3066 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 20:56:47 +00:00
Richard Alam
d137362acb - appkonference ami notifications now works...next meetme 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3065 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 04:01:29 +00:00
Richard Alam
1091fc3efd - got conference apps implemented 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3064 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 22:35:50 +00:00
Richard Alam
7ac82267ad - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3062 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 16:16:22 +00:00
Richard Alam
51531c90e4 - checking in things..don't want to loose these as eclipse is acting like a spoiled brat this morning :) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3061 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 16:05:03 +00:00
Richard Alam
d7ddb37b27 - implement appkonference events and commands 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3058 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 22:34:37 +00:00
Richard Alam
e38ebecda6 - handle new memberId field from AMI events 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3057 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 18:24:47 +00:00
Richard Alam
1983b03fa8 - rename classes to match event names generated by appkonference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3055 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 15:55:46 +00:00
Richard Alam
c0e27540e9 - put java classes into java src folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3053 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 22:17:43 +00:00
Richard Alam
5971e22115 - add appkonference events 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3052 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 22:11:15 +00:00
Richard Alam
e24adb55ec - convert build to gradle 
- haven't figured out the tests yet though

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3051 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 20:18:53 +00:00
Richard Alam
659c0055b6 - cleanup and move things around 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3050 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:42:13 +00:00
Richard Alam
ac19017e13 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3049 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:40:03 +00:00
Richard Alam
ff892e1635 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3048 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:38:43 +00:00
Richard Alam
822741a3c6 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3046 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:35:37 +00:00
DJP
829e5c9635 Error handling on file convertion failed - Additional filetype support 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2989 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-11 00:41:24 +00:00
Fred Dixon
ce7112b3eb Depreciated bbb-apps/build.sh 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2841 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 22:12:10 +00:00
Richard Alam
7d9ac81c3c - make /usr/share/red5 as default for red5.home 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2833 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 15:19:04 +00:00
Fred Dixon
6c3b069a34 Added check-first-run-resolve task to 'ant deploy' to automatically run 'ant resove' the first time in bbb-apps build.xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2828 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 04:07:25 +00:00
Jeremy Thomerson
65c876c593 simplify the configuration for SI 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2660 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-29 04:44:47 +00:00
Jeremy Thomerson
889984c530 have prototype of end-to-end JMS messaging for conference events with spring integration 
forgot to svn add one new package

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2658 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 21:55:51 +00:00
Jeremy Thomerson
66a9477a0b have prototype of end-to-end JMS messaging for conference events with spring integration 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2656 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 21:31:04 +00:00
Jeremy Thomerson
a9b1eb8f66 downgrade spring-integration jars since 1.0.3 has problem with grails 1.1.1 
see: http://forum.springsource.org/showthread.php?p=259868


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2655 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 17:52:25 +00:00
Jeremy Thomerson
88cc35c82a got conference ended event working as well 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2654 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 16:19:28 +00:00
Jeremy Thomerson
a9b2b1ea06 first working prototype of sending JMS messages with Spring Integration for conference-related events. 
NOTE: this is not a final API or configuration - but simply a checkpoint in the development process.  It will be changing quite a bit over the next week or two

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2653 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-27 21:06:01 +00:00
Jeremy Thomerson
d67008340f some fixes to log messages / some log messages added 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2629 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 18:14:38 +00:00
Jeremy Thomerson
ca347c8e40 convert groovy project so it works in eclipse 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2623 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 17:34:51 +00:00
Jeremy Thomerson
c37f52013d update svn ignore to ignore build artifacts and fix .classpath for groovy 1.6.4 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2589 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-22 22:42:32 +00:00
Jeremy Thomerson
0338f058c0 updating groovy version on trunk to correct version 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2585 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-22 22:18:13 +00:00
Richard Alam
ecdb39000e - change the location of logs 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2484 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-14 16:17:16 +00:00
Richard Alam
123aab7758 - modify logging layout 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2466 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 18:54:18 +00:00
Richard Alam
51ffec86ed - change jmsTemplate to messageListener (see http://www.theserverside.com/news/thread.tss?thread_id=37740) 
- fix logback.xml

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2465 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 18:37:25 +00:00
Richard Alam
53bcfac046 - add headers 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2462 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 16:00:07 +00:00
Richard Alam
08893f09f3 - change logging to rolling file appender and rotate every day 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2460 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 13:58:36 +00:00
Richard Alam
28432aa018 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2420 af16638f-c34d-0410-8cfa-b39d5352b314 2009-09-10 16:31:24 +00:00
Richard Alam
94e743c7f6 - append logs by default...we don't want to delete the logs when red5 restarts 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2373 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-04 20:14:17 +00:00
Richard Alam
266e16bdad - use ExecutorService to handle JMS messages. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2363 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-04 15:06:30 +00:00
Richard Alam
bde00c7a4a - upgrade versions of junit, commons-lang, mina libs 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2168 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-11 15:45:08 +00:00
Richard Alam
0dfa0e1e16 - rename build.properties to bbb-apps-build.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2167 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-11 15:43:50 +00:00
Richard Alam
2b7cb3673c - remove cvsdude repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2098 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-02 11:00:29 +00:00
Denis Zgonjanin
7cbab66ce7 Private chat changes 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1877 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-13 19:58:01 +00:00
Denis Zgonjanin
a010aeb8a7 Changes to chat to support private chat 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1857 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-10 15:27:45 +00:00
Denis Zgonjanin
2f31d7a1f6 Changes to chat to support private chat 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1856 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-10 15:15:38 +00:00
Denis Zgonjanin
f68338ef4d git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1854 af16638f-c34d-0410-8cfa-b39d5352b314 2009-07-09 20:29:33 +00:00
Denis Zgonjanin
8c0aefa99f More private chat stuff 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1853 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-09 20:28:44 +00:00
Denis Zgonjanin
85dbfe245e git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1852 af16638f-c34d-0410-8cfa-b39d5352b314 2009-07-09 19:58:17 +00:00
Denis Zgonjanin
2d1ce7d72f Changes to support private chat 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1851 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-09 19:32:09 +00:00
Fred Dixon
5d9e4262d8 added LGPL license 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1830 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-30 18:41:58 +00:00
Fred Dixon
8f58fbb59d Adding LGPL license 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1829 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-30 18:39:04 +00:00
Richard Alam
04d7f2942e - removing whiteboard update as it got checkedin to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1741 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-22 02:22:03 +00:00
minoustudio
738588240e for whiteboard 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1647 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-17 20:33:33 +00:00
Richard Alam
4fa3d4b585 - put in license file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1603 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-12 15:15:57 +00:00
Richard Alam
9295524808 - check if there is a connection to asterisk and log an error if there is none 
- catch ManagerCommunicationException

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1592 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-10 17:25:49 +00:00
Fred Dixon
d54ad1855b small changes to build.sh for BigBlueButton apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1541 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-03 01:47:40 +00:00
Fred Dixon
b0851e9b16 minor updates to build.sh script for BigBlueButton.apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1538 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-03 01:25:19 +00:00
Fred Dixon
c4d173bcc7 added build.sh helper script to help build BigBlueButt-apps on Ubuntu linux 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1536 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 23:38:41 +00:00
Fred Dixon
18c6f1c3fd removed carriage returns for development on Unix 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1532 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 21:52:28 +00:00
Richard Alam
be86377918 - make user's custom build a hidden file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1516 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 13:31:06 +00:00
Richard Alam
1c1801fbf8 - move properties that won't need to be customized into build.xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1515 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 21:00:21 +00:00
Richard Alam
6635a128ee - move properties that won't need to be customized into build.xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1514 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 20:47:27 +00:00
Richard Alam
98479eeae7 - rename user's build.properties to bbb-apps-build.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1512 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 17:55:15 +00:00
Fred Dixon
72eb992fb7 testing build of bigbluebutton-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1507 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-31 16:05:30 +00:00
Fred Dixon
a3d8481e3f testing build of bigbluebutton-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1506 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-31 16:02:11 +00:00
Fred Dixon
9fb971416a removed syntax error in bigbluebutton.properties in bigbluebutton-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1505 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-31 15:40:40 +00:00
Fred Dixon
559528350b updated bigbluebutton.properties for red5 app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1486 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-29 14:14:22 +00:00
Fred Dixon
f98f0f9a4f use localhost for location of asterisk server in red5 bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1480 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-28 22:16:53 +00:00
Richard Alam
b0528e1b5b - fix issue where a participant is not removed from the voice conference room when he/she leaves 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1426 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 22:13:07 +00:00
Richard Alam
b1c47b3c60 - include the current presentation name when queried for presentation information 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1422 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 17:50:48 +00:00
Richard Alam
5531c16731 - try to kickstart hudson as it is stuck 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1412 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 03:04:00 +00:00
Richard Alam
161390a321 - use localhost as default asterisk server 
- do not externalize properties for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1400 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-06 19:18:42 +00:00
Richard Alam
4cce0c6cb9 - make it possible to put bigbluebutton.properties external 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1393 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-06 15:19:44 +00:00
Richard Alam
a9935bd4b1 - provide way to set version in properties file so we know which revision we are running 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1391 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-05 18:23:00 +00:00
Richard Alam
7d2d7e50b7 - setup recording only when the host asked the session to be recorded 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1390 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-05 18:04:38 +00:00
Richard Alam
f409469748 - use the voicebridge instead of conference room to connect to voice conference server 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1388 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-05 15:16:31 +00:00
Richard Alam
f371af456e - accidentally deleted params for conference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1372 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-04 21:41:19 +00:00
Richard Alam
f95cf0e9ee - add record and voicebridge into session passed from the client 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1365 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-02 21:01:49 +00:00
Richard Alam
22aeb0477a - allow several clients to playback a recorded session independently 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1363 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-02 18:09:59 +00:00
Richard Alam
d6183874eb - change ivy.xml to download red5-0.8rc3 instead of re85-0.8rc2 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1360 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-02 14:59:40 +00:00
Richard Alam
c04219d9bd - merge in branches/developers/ritzalam/bbb-apps-playback 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1337 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-29 19:41:23 +00:00
minoustudio
bdb996929b multi-presentation, fix conflict 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1244 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-14 20:35:23 +00:00
minoustudio
dccb79c8e2 20090414: multi-presentation 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1240 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-14 15:47:57 +00:00
Richard Alam
e335c42f29 - record events in XML instead of YAML 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1224 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-09 20:03:16 +00:00
Richard Alam
7f09116ac1 - create sample fixture 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1220 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-08 20:15:33 +00:00
Richard Alam
7cf1233268 - setup structure for fitnesse tests 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1219 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-08 16:01:46 +00:00
Richard Alam
eed6cec676 - extract build properties from build.xml into build.properties 
- create new structure for src and test

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1218 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-07 19:38:07 +00:00
minoustudio
0bc4e34940 seperate red5-web.xml into bbb-apps.xml 
20090407

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1216 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-07 14:35:49 +00:00
Richard Alam
db522ce42b - change red5_home 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1214 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-06 18:00:29 +00:00
Richard Alam
f6d31f50ef - update trunk to red5-0.8rc2 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1213 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-06 17:55:26 +00:00
minoustudio
c842c8196f - remove resolver ibiblio with maven central...ibiblio seems to be always down. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1212 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-06 17:37:11 +00:00
Richard Alam
77ca97e6ea - remove app source dir 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1200 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 21:05:00 +00:00
Richard Alam
45ba0811e4 - remove other apps we don't need 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1195 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 20:23:53 +00:00
Richard Alam
bd26c3695d - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1189 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:44:39 +00:00
Richard Alam
b112f84466 - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1188 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:39:51 +00:00
Richard Alam
53c80f37f7 - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1187 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:35:20 +00:00
Richard Alam
e1b0737714 - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1186 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:34:38 +00:00
Richard Alam
c5c3032ec6 move testng taskdef into test-compile. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@868 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-21 16:31:16 +00:00
Richard Alam
7dff6bddc7 add spring-jms dependency 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@867 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-21 16:28:40 +00:00
Richard Alam
0d695181f3 couple of tests. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@853 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-20 19:18:05 +00:00
Richard Alam
055a9da1ac Try to write tests with TestNG and Easymock. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@852 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-14 19:00:55 +00:00
Richard Alam
b2edb039a0 Start refactor voice conference app. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@851 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-13 20:46:48 +00:00
Richard Alam
c9702cb233 Setup TestNG and Easymock to be used for tests. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@850 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-13 18:56:28 +00:00
Richard Alam
09f73b1a89 use ivy to publish red5.jar into the local repository so that we can use ivy to get red5.jar as a dependency for bigbluebutton-apps. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@849 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-10 02:15:17 +00:00
Richard Alam
1177a1b61a use ivy to manage dependencies. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@847 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-10 00:11:12 +00:00
Richard Alam
a75a27101b Make build pass the test for now until we sort out the use of ivy. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@844 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-09 15:24:29 +00:00
Richard Alam
8ba521530c use ivy to pull down library dependencies. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@843 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-09 14:37:27 +00:00
Richard Alam
c87f7b0363 Figuring out ivy to manage dependencies. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@842 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-08 15:14:37 +00:00
Richard Alam
a0565c010a Fix compile problem. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@841 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-07 16:22:33 +00:00
Richard Alam
02fa8ef077 Start refactor voice conference app. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@836 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-06 22:44:45 +00:00
Richard Alam
ed884ebda9 set up ivy for dependency management. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@835 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-06 00:13:00 +00:00
Richard Alam
a1b3add78f move voice app under bigbluebutton. start refactoring so that there will only be onw app. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@834 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-06 00:12:14 +00:00
Richard Alam
ef795cc749 start refactor voice app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@829 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-05 02:09:21 +00:00
Richard Alam
c249255458 Add a ping to generate traffic on the connection. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@824 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-31 04:55:15 +00:00
Richard Alam
b792d59131 rename package from bigbluebuttonproject to bigbluebutton 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@822 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-30 15:25:33 +00:00
Richard Alam
88d9ff7f88 Setup unit test structure. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@821 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-30 01:54:34 +00:00
Richard Alam
466244240f deploy should depend on dist. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@819 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-27 16:41:14 +00:00
Richard Alam
8b347898e6 create zip file. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@818 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-27 16:06:19 +00:00
Richard Alam
87a5d4fbfc Create dist files. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@811 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-22 00:12:53 +00:00
Richard Alam
20e552091c restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@810 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:39:17 +00:00
Richard Alam
f993d9084a restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@808 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:30:48 +00:00
Richard Alam
7771d4c821 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@807 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:30:09 +00:00
Richard Alam
366741b436 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@806 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:29:44 +00:00
Richard Alam
fa52c5ad67 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@804 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:28:05 +00:00
Richard Alam
4285f778e5 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@802 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:26:45 +00:00
Richard Alam
94e3535568 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@800 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 19:25:16 +00:00
Richard Alam
20bfa49e89 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@797 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:23:47 +00:00
Richard Alam
fd67b9c874 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@796 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:23:20 +00:00
Richard Alam
5903a43cee git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@795 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:22:52 +00:00
Richard Alam
f91daccb5d git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@794 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:22:27 +00:00
Richard Alam
6a936eb23f git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@793 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:21:54 +00:00
Richard Alam
baa2ee475c create dist for each app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@790 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 23:05:46 +00:00
Richard Alam
110c411fdf Make compile work. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@789 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:20:19 +00:00
Richard Alam
a5df366410 Make compile work. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@788 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:20:08 +00:00
Richard Alam
84aeaee599 Make compile work. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@787 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:19:54 +00:00
Richard Alam
9c3f07428a rename folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@786 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:16:32 +00:00
Richard Alam
6c9b10d74e rename folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@785 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:16:03 +00:00
Richard Alam
fbc4ae8c1d rename folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@784 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:15:43 +00:00
Richard Alam
83d4455951 Initial import of apps extracted from bigbluebutton-server. Need to separate our apps from red5 server. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@783 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 13:55:47 +00:00