From cad05a9ce10c9a53596241613db2dddd88796639 Mon Sep 17 00:00:00 2001 From: BigBlueButton Date: Mon, 19 Jul 2010 19:27:24 +0000 Subject: [PATCH] - bbb-scheduling has been removed from bbb-web --- .../grails-app/conf/DataSource.groovy | 34 -- .../grails-app/conf/SecurityFilters.groovy | 24 -- .../PublicScheduledSessionController.groovy | 313 ------------------ .../bigbluebutton/web/domain/Account.groovy | 44 --- .../web/domain/Conference.groovy | 48 --- .../web/domain/Permission.groovy | 31 -- .../org/bigbluebutton/web/domain/Role.groovy | 30 -- .../web/domain/RolePermissionRel.groovy | 33 -- .../web/domain/ScheduledSession.groovy | 71 ---- .../org/bigbluebutton/web/domain/User.groovy | 37 --- .../web/domain/UserPermissionRel.groovy | 34 -- .../web/domain/UserRoleRel.groovy | 27 -- .../web/domain/VoiceConferenceBridge.groovy | 29 -- .../services/AdhocConferenceService.groovy | 114 ------- .../web/services/SchedulingService.groovy | 12 - .../grails-app/views/adhoc/demo.gsp | 26 -- .../grails-app/views/adhoc/joindemo.gsp | 30 -- .../grails-app/views/adhoc/show.gsp | 46 --- .../grails-app/views/attendees/create.gsp | 101 ------ .../grails-app/views/attendees/edit.gsp | 104 ------ .../grails-app/views/attendees/list.gsp | 64 ---- .../grails-app/views/attendees/show.gsp | 93 ------ .../grails-app/views/auth/login.gsp | 39 --- .../views/conference/_instructions.gsp | 26 -- .../grails-app/views/conference/create.gsp | 53 --- .../grails-app/views/conference/edit.gsp | 85 ----- .../grails-app/views/conference/list.gsp | 41 --- .../grails-app/views/conference/show.gsp | 99 ------ .../grails-app/views/join/login.gsp | 34 -- .../views/publicScheduledSession/joinIn.gsp | 57 ---- .../views/publicScheduledSession/show.gsp | 96 ------ .../views/publicScheduledSession/signIn.gsp | 14 - .../views/scheduledSession/create.gsp | 139 -------- .../views/scheduledSession/edit.gsp | 177 ---------- .../views/scheduledSession/list.gsp | 49 --- .../views/scheduledSession/show.gsp | 130 -------- .../grails-app/views/user/changepassword.gsp | 49 --- .../grails-app/views/user/create.gsp | 65 ---- .../grails-app/views/user/edit.gsp | 77 ----- .../grails-app/views/user/list.gsp | 54 --- .../grails-app/views/user/show.gsp | 71 ---- bigbluebutton-web/web-app/index.gsp | 2 +- 42 files changed, 1 insertion(+), 2701 deletions(-) mode change 100644 => 100755 bigbluebutton-web/grails-app/conf/DataSource.groovy mode change 100644 => 100755 bigbluebutton-web/grails-app/conf/SecurityFilters.groovy delete mode 100755 bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Account.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Conference.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Permission.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Role.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/RolePermissionRel.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/ScheduledSession.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/User.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserPermissionRel.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserRoleRel.groovy delete mode 100644 bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/VoiceConferenceBridge.groovy delete mode 100644 bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/AdhocConferenceService.groovy delete mode 100644 bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/SchedulingService.groovy delete mode 100644 bigbluebutton-web/grails-app/views/adhoc/demo.gsp delete mode 100644 bigbluebutton-web/grails-app/views/adhoc/joindemo.gsp delete mode 100644 bigbluebutton-web/grails-app/views/adhoc/show.gsp delete mode 100644 bigbluebutton-web/grails-app/views/attendees/create.gsp delete mode 100644 bigbluebutton-web/grails-app/views/attendees/edit.gsp delete mode 100644 bigbluebutton-web/grails-app/views/attendees/list.gsp delete mode 100644 bigbluebutton-web/grails-app/views/attendees/show.gsp delete mode 100644 bigbluebutton-web/grails-app/views/auth/login.gsp delete mode 100644 bigbluebutton-web/grails-app/views/conference/_instructions.gsp delete mode 100644 bigbluebutton-web/grails-app/views/conference/create.gsp delete mode 100644 bigbluebutton-web/grails-app/views/conference/edit.gsp delete mode 100644 bigbluebutton-web/grails-app/views/conference/list.gsp delete mode 100644 bigbluebutton-web/grails-app/views/conference/show.gsp delete mode 100644 bigbluebutton-web/grails-app/views/join/login.gsp delete mode 100644 bigbluebutton-web/grails-app/views/publicScheduledSession/joinIn.gsp delete mode 100644 bigbluebutton-web/grails-app/views/publicScheduledSession/show.gsp delete mode 100644 bigbluebutton-web/grails-app/views/publicScheduledSession/signIn.gsp delete mode 100644 bigbluebutton-web/grails-app/views/scheduledSession/create.gsp delete mode 100644 bigbluebutton-web/grails-app/views/scheduledSession/edit.gsp delete mode 100644 bigbluebutton-web/grails-app/views/scheduledSession/list.gsp delete mode 100644 bigbluebutton-web/grails-app/views/scheduledSession/show.gsp delete mode 100644 bigbluebutton-web/grails-app/views/user/changepassword.gsp delete mode 100644 bigbluebutton-web/grails-app/views/user/create.gsp delete mode 100644 bigbluebutton-web/grails-app/views/user/edit.gsp delete mode 100644 bigbluebutton-web/grails-app/views/user/list.gsp delete mode 100644 bigbluebutton-web/grails-app/views/user/show.gsp mode change 100644 => 100755 bigbluebutton-web/web-app/index.gsp diff --git a/bigbluebutton-web/grails-app/conf/DataSource.groovy b/bigbluebutton-web/grails-app/conf/DataSource.groovy old mode 100644 new mode 100755 index ccae98c689..a97dcfee3c --- a/bigbluebutton-web/grails-app/conf/DataSource.groovy +++ b/bigbluebutton-web/grails-app/conf/DataSource.groovy @@ -17,37 +17,3 @@ * * $Id: $ */ -dataSource { - pooled = false - driverClassName = "com.mysql.jdbc.Driver" - username = "bbb@localhost" - password = "secret" -} - -//hibernate { -// cache.use_second_level_cache=true -// cache.use_query_cache=true -// cache.provider_class='org.hibernate.cache.EhCacheProvider' -//} - -// environment specific settings -environments { - development { - dataSource { - pooled = true - dbCreate = "update" // one of 'create', 'create-drop','update' - } - } - test { - dataSource { - dbCreate = 'create' - url = "jdbc:mysql://localhost/bigbluebutton_test" - } - } - production { - dataSource { - pooled = true - dbCreate = "update" // one of 'create', 'create-drop','update' - } - } -} \ No newline at end of file diff --git a/bigbluebutton-web/grails-app/conf/SecurityFilters.groovy b/bigbluebutton-web/grails-app/conf/SecurityFilters.groovy old mode 100644 new mode 100755 index ed7b8add49..dd1f207a89 --- a/bigbluebutton-web/grails-app/conf/SecurityFilters.groovy +++ b/bigbluebutton-web/grails-app/conf/SecurityFilters.groovy @@ -28,38 +28,14 @@ class SecurityFilters { switch (controllerName) { case 'api': - case 'portal': - case 'join': - case 'adhoc': case 'presentation': return true break - case 'publicScheduledSession': - return true } // This just means that the user must be authenticated. He does // not need any particular role or permission. accessControl { true } } } - - // Creating, modifying, or deleting a user requires the "Administrator" - // role. - userEditing(controller: "user", action: "(create|edit|save|update|delete|list)") { - before = { - accessControl { - role("Administrator") - } - } - } - - // Showing a user requires the "Administrator" *or* the "User" roles. - userShow(controller: "user", action: "show") { - before = { - accessControl { - role("Administrator") || role("User") - } - } - } } } \ No newline at end of file diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy deleted file mode 100755 index 82e22aba36..0000000000 --- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy +++ /dev/null @@ -1,313 +0,0 @@ -/* BigBlueButton - http://www.bigbluebutton.org - * - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.controllers - -import java.text.MessageFormat; -import org.bigbluebutton.web.domain.ScheduledSession -import org.bigbluebutton.web.domain.Conference -import grails.converters.* -import org.codehaus.groovy.grails.commons.* -import org.bigbluebutton.web.services.DynamicConferenceService; -import org.bigbluebutton.web.services.SchedulingService -import org.bigbluebutton.api.domain.DynamicConference; - -class PublicScheduledSessionController { - DynamicConferenceService dynamicConferenceService; - def schedulingService - - def DIAL_NUM = /%%DIALNUM%%/ - def CONF_NUM = /%%CONFNUM%%/ - def CONF_NAME = /%%CONFNAME%%/ - - def keywordList = [DIAL_NUM, CONF_NUM, CONF_NAME]; - - def beforeInterceptor = { - if (schedulingService.schedulingServiceEnabled) { - return true - } - - response.sendError 403 - return false - } - - def index = { - redirect(action:joinIn) - } - - def show = { - def tokenId = session['conference'] - def sessionId = session['room'] - - if (!tokenId || !sessionId) { - redirect(action:joinIn,id:tokenId) - } - - def scheduledSessionInstance = ScheduledSession.findByTokenId( tokenId ) - - if(!scheduledSessionInstance) { - flash.message = "Could not find conference session." - redirect(action:joinIn) - } - else { - def config = ConfigurationHolder.config - def hostURL = config.bigbluebutton.web.serverURL - println "serverURL $hostURL" - def now = new Date().time - def inSession = ((now > scheduledSessionInstance.startDateTime.time) && (now < scheduledSessionInstance.endDateTime.time)) - return [ scheduledSessionInstance : scheduledSessionInstance, hostUrl:hostURL, inSession:inSession ] - } - } - - def joinIn = { - session.invalidate() - def sessionInfo - - if (params.id) { - def conference = Conference.findByConferenceNumber(params.id) - if (conference) { - def c = ScheduledSession.createCriteria() - def now = new Date() - def results = c { - eq('voiceConferenceBridge', conference.conferenceNumber.toString()) - and { - le('startDateTime', now) - and { - gt('endDateTime', now) - } - } - maxResults(1) - } - if (results) { - def confSession = results[0]; - sessionInfo = [name: confSession.name, description: confSession.description] - } - } - } - - return [ fullname: params.fullname, id:(params.id), password: params.password, info:sessionInfo ] - - } - - def signIn = { - if (params.fullname.trim() == "") { - log.debug "USer entered a blank name" - flash.message = "Please enter your name." - render(view:"joinIn", model: [id:params.id, fullname:params.fullname]) - return - } else { - log.debug "Fullname is not null ${params.fullname}" - } - - log.debug "Attempting to sign in to ${params.id}" - def conference = Conference.findByConferenceNumber(params.id) - def signedIn = false - if (conference) { - def c = ScheduledSession.createCriteria() - def now = new Date() - def results = c { - eq('voiceConferenceBridge', conference.conferenceNumber.toString()) - and { - le('startDateTime', now) - and { - gt('endDateTime', now) - } - } - maxResults(1) - } - - if (results) { - def confSession = results[0]; - def role = '' - - if (confSession) { - log.debug "Found conference session ${confSession.name}" - switch (params.password) { - case confSession.hostPassword: - log.debug "Logged in as host" - // Let us set role to MODERATOR for now as we don't support HOST yet - role = "MODERATOR" - signedIn = true - break - case confSession.moderatorPassword: - log.debug "Logged in as as moderator" - role = "MODERATOR" - signedIn = true - break - case confSession.attendeePassword: - log.debug "Logged in as viewer" - role = "VIEWER" - signedIn = true - break - } - if (signedIn) { - log.debug "Login successful...setting in session information" - - def welcomeMessage = dynamicConferenceService.defaultWelcomeMessage - def dialNumber = dynamicConferenceService.defaultDialAccessNumber - - if (welcomeMessage != null || welcomeMessage != "") { - log.debug "Substituting keywords" - - keywordList.each{ keyword -> - switch(keyword){ - case DIAL_NUM: - if ((dialNumber != null) || (dialNumber != "")) { - welcomeMessage = welcomeMessage.replaceAll(DIAL_NUM, dialNumber) - } - break - case CONF_NUM: - welcomeMessage = welcomeMessage.replaceAll(CONF_NUM, confSession.voiceConferenceBridge) - break - case CONF_NAME: - welcomeMessage = welcomeMessage.replaceAll(CONF_NAME, confSession.getName()) - break - } - } - } - - session["fullname"] = params.fullname - session["role"] = role - session["conference"] = confSession.tokenId - session["room"] = confSession.sessionId - session["voicebridge"] = confSession.voiceConferenceBridge - session["conferencename"] = confSession.getName() - session['welcome'] = welcomeMessage - - def long _10_MINUTES = 10*60*1000 - - def startTime = confSession.startDateTime.time - _10_MINUTES - def endTime = confSession.endDateTime.time + _10_MINUTES - - if ((startTime <= now.time) && (now.time <= endTime)) { - session["mode"] = "LIVE" - session["record"] = false - if (confSession.record) { - session["record"] = true - } - log.debug "Joining LIVE and recording is ${confSession.record}" - } else { - session["mode"] = "PLAYBACK" - log.debug "Joining PLAYBACK" - } - - log.debug "Displaying session information" - //redirect(action:show) - def config = ConfigurationHolder.config - def hostUrl = config.bigbluebutton.web.serverURL - redirect(url:"${hostUrl}/client/BigBlueButton.html") - } - } - } - } - - if (!signedIn) { - flash.message = "Could not log you into the conference. Please check if your conference number or schedule is correct." - render(view:"joinIn",model: [id:params.id, fullname:params.fullname]) - } - } - - def enter = { - def fname = session["fullname"] - def rl = session["role"] - def cnf = session["conference"] - def rm = session["room"] - def vb = session["voicebridge"] - def wbv = session["webvoiceconf"] - def rec = session["record"] - def md = session["mode"] - def confName = session["conferencename"] - def welcomeMsg = session['welcome'] - def meetID = session["meetingID"] - def externUID = session["externUserID"] - - if (!rm) { - response.addHeader("Cache-Control", "no-cache") - withFormat { - xml { - render(contentType:"text/xml") { - 'join'() { - returncode("FAILED") - message("Could not find conference ${params.conference}.") - } - } - } - } - } else { - response.addHeader("Cache-Control", "no-cache") - withFormat { - xml { - render(contentType:"text/xml") { - 'join'() { - returncode("SUCCESS") - fullname("$fname") - confname("$confName") - meetingID("$meetID") - externUserID("$externUID") - role("$rl") - conference("$cnf") - room("$rm") - voicebridge("${vb}") - webvoiceconf("${wbv}") - mode("$md") - record("$rec") - welcome("$welcomeMsg") - } - } - } - } - } - } - - def signOut = { - def config = ConfigurationHolder.config - def hostURL = config.bigbluebutton.web.logoutURL - - log.debug("LogoutURL=$hostURL") - - // For backward compatibility. We renamed "loggedOutUrl" to - // "logoutURL" in 0.64 to be consistent with the API. Remove this - // in later iterations (ralam mar 26, 2010) - //if ((hostURL == null) || (hostURL == "")) { - if (hostURL.isEmpty()) { - log.debug("No logoutURL property set. Checking for old loggedOutUrl.") - hostURL = config.bigbluebutton.web.loggedOutUrl - if (!hostURL.isEmpty()) - log.debug("Old loggedOutUrl property set to $hostURL") - } - - def meetingToken = session["conference"] - DynamicConference conf = dynamicConferenceService.getConferenceByToken(meetingToken) - if (conf != null) { - if ((conf.logoutUrl != null) && (conf.logoutUrl != "")) { - hostURL = conf.logoutUrl - log.debug("logoutURL has been set from API. Redirecting to server url $hostURL.") - } - } - - if (hostURL.isEmpty()) { - hostURL = config.bigbluebutton.web.serverURL - log.debug("No logout url. Redirecting to server url $hostURL.") - } - // Log the user out of the application. - session.invalidate() - println "serverURL $hostURL" - redirect(url: hostURL) - } -} diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Account.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Account.groovy deleted file mode 100644 index cc6e89ad65..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Account.groovy +++ /dev/null @@ -1,44 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class Account implements Comparable { - Date created - Date lastUpdated - String createdBy - String updatedBy - String type - String name - String description - - static belongsTo = [owner:User] - static hasMany = [users:User, conferences:Conference] - - static constraints = { - name(maxLength:50, blank:false) - type(inList:['BASIC', 'ESSENTIAL', 'PREMIUM']) - } - - String toString() {"${this.name}"} - - int compareTo(obj) { - obj.id.compareTo(id) - } -} diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Conference.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Conference.groovy deleted file mode 100644 index 3f5e394243..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Conference.groovy +++ /dev/null @@ -1,48 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class Conference implements Comparable { - Date dateCreated - Date lastUpdated - String createdBy - String updatedBy - String name - Integer conferenceNumber - User user - - SortedSet sessions - - static hasMany = [sessions:ScheduledSession] - - static constraints = { - name(maxLength:50, blank:false) - conferenceNumber(unique:true, size:5..10) - } - - String toString() {"${this.id}:${this.name} ${this.user}"} - - int compareTo(obj) { - obj.id.compareTo(id) - } - -} - - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Permission.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Permission.groovy deleted file mode 100644 index 95d001bb82..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Permission.groovy +++ /dev/null @@ -1,31 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class Permission { - String type - String possibleActions - - static constraints = { - type(nullable: false, blank: false, unique: true) - possibleActions(nullable:false, blank: false) - } -} - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Role.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Role.groovy deleted file mode 100644 index 7bd14165e2..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Role.groovy +++ /dev/null @@ -1,30 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class Role { - String name - - static constraints = { - name(nullable: false, blank: false, unique: true) - } -} - - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/RolePermissionRel.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/RolePermissionRel.groovy deleted file mode 100644 index c355a6ee15..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/RolePermissionRel.groovy +++ /dev/null @@ -1,33 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class RolePermissionRel { - Role role - Permission permission - String target - String actions - - static constraints = { - actions(nullable: false, blank: false) - } -} - - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/ScheduledSession.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/ScheduledSession.groovy deleted file mode 100644 index 06e7f3cf68..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/ScheduledSession.groovy +++ /dev/null @@ -1,71 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class ScheduledSession implements Comparable { - Date dateCreated - Date lastUpdated - String createdBy - String modifiedBy - - String name - String description - /* The id for this session. This can be used as the conference room in Red5, for example. */ - String sessionId - /* An id that we can use in the URL to join this conference session */ - String tokenId - Integer numberOfAttendees = new Integer(3) - /* Is there a time limit for this session? */ - Boolean timeLimited = true - Date startDateTime - /* If there is a time limit, until when? */ - Date endDateTime - /* Is this session going to be recorded? */ - Boolean record = false - /* Do we require a password to join this session? */ - Boolean passwordProtect = true - String hostPassword = 'change-me-please' - String moderatorPassword = 'change-me-please' - String attendeePassword = 'change-me-please' - String voiceConferenceBridge - - Date getCurrentTime() { new Date() } - static transients = ['currentTime'] - - public ScheduledSession() { - startDateTime = new Date() - // Set the end to 1 hour after start - endDateTime = new Date(startDateTime.time + 60*60*1000) - } - - Conference conference - - static constraints = { - name(maxLength:50, blank:false) - tokenId(blank:false) - sessionId(blank:false) - } - - String toString() {"${this.id}:${this.name} - ${this.sessionId} ${this.tokenId}"} - - int compareTo(obj) { - obj.id.compareTo(id) - } -} diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/User.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/User.groovy deleted file mode 100644 index 2119c7a670..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/User.groovy +++ /dev/null @@ -1,37 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class User { - String username - String passwordHash - String fullName - Date dateCreated - Date lastUpdated - - static constraints = { - username(nullable: false, blank:false,email:true,unique:true) - fullName(blank:false) - } - - String toString() {"${this.id}:${this.username},${this.fullName}"} -} - - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserPermissionRel.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserPermissionRel.groovy deleted file mode 100644 index 7fb39f5582..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserPermissionRel.groovy +++ /dev/null @@ -1,34 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class UserPermissionRel { - User user - Permission permission - String target - String actions - - static constraints = { - target(nullable: true, blank: false) - actions(nullable: false, blank: false) - } -} - - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserRoleRel.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserRoleRel.groovy deleted file mode 100644 index 88749378af..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/UserRoleRel.groovy +++ /dev/null @@ -1,27 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class UserRoleRel { - User user - Role role -} - - diff --git a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/VoiceConferenceBridge.groovy b/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/VoiceConferenceBridge.groovy deleted file mode 100644 index 73b6457473..0000000000 --- a/bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/VoiceConferenceBridge.groovy +++ /dev/null @@ -1,29 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.web.domain - -class VoiceConferenceBridge { - Date dateCreated - Date lastUpdated - String createdBy - String modifiedBy - - -} diff --git a/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/AdhocConferenceService.groovy b/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/AdhocConferenceService.groovy deleted file mode 100644 index 5f025d9ec3..0000000000 --- a/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/AdhocConferenceService.groovy +++ /dev/null @@ -1,114 +0,0 @@ -/* BigBlueButton - http://www.bigbluebutton.org - * - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * @version $Id: $ - */ -package org.bigbluebutton.web.services - -import org.bigbluebutton.presentation.service.AdhocConference -import java.util.concurrent.ConcurrentHashMap - -public class AdhocConferenceService{ - boolean transactional = false - def serviceEnabled = false - - private final Map conferences - - public AdhocConferenceService() { - conferences = new ConcurrentHashMap() - } - - public void createConference(String voiceBridge) { - AdhocConference conference = new AdhocConference(voiceBridge) - if (!conferences.containsKey(conference.voiceBridge)) - conferences.put(conference.voiceBridge, conference) - } - - public void createConference(AdhocConference conference) { - if (!conferences.containsKey(conference.voiceBridge)) - conferences.put(conference.voiceBridge, conference) - } - - public boolean conferenceExistWithVoiceBridge(String voiceBridge) { - return conferences.containsKey(voiceBridge) - } - - /* - * Returns the AdhocConference if present, - * or null if absent. - */ - public AdhocConference getConferenceWithVoiceBridge(String voiceBridge) { - return conferences.get(voiceBridge) - } - - public boolean conferenceExistWithModeratorToken(String token) { - for (Iterator iter = conferences.values().iterator(); iter.hasNext();) { - AdhocConference conf = (AdhocConference) iter.next() - println conf.moderatorToken - if (conf.moderatorToken == token) { - return true - } - } - - return false - } - - /* - * Returns the AdhocConference if present, - * or null if absent. - */ - public AdhocConference getConferenceWithModeratorToken(String token) { - for (Iterator iter = conferences.values().iterator(); iter.hasNext();) { - AdhocConference conf = (AdhocConference) iter.next() - println conf.moderatorToken - if (conf.moderatorToken == token) { - return conf - } - } - - return null - } - - public boolean conferenceExistWithViewerToken(String token) { - for (Iterator iter = conferences.values().iterator(); iter.hasNext();) { - AdhocConference conf = (AdhocConference) iter.next() - println conf.viewerToken - if (conf.viewerToken == token) { - return true - } - } - - return false - } - - /* - * Returns the AdhocConference if present, - * or null if absent. - */ - public AdhocConference getConferenceWithViewerToken(String token) { - for (Iterator iter = conferences.values().iterator(); iter.hasNext();) { - AdhocConference conf = (AdhocConference) iter.next() - println conf.viewerToken - if (conf.viewerToken == token) { - return conf - } - } - - return null - } - -} diff --git a/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/SchedulingService.groovy b/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/SchedulingService.groovy deleted file mode 100644 index 3bd290a109..0000000000 --- a/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/SchedulingService.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package org.bigbluebutton.web.services; - -/* - * This class will enable/disable the scheduling of conference. We need - * this to support the old scheduling mechanism with ability to disable it - * for those who will just use the API. Eventually, all scheduling should - * be done using the API. - */ -public class SchedulingService { - static transactional = false - def schedulingServiceEnabled = false -} diff --git a/bigbluebutton-web/grails-app/views/adhoc/demo.gsp b/bigbluebutton-web/grails-app/views/adhoc/demo.gsp deleted file mode 100644 index 8f68ca57a5..0000000000 --- a/bigbluebutton-web/grails-app/views/adhoc/demo.gsp +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Login - - - -
${flash.message}
- -
- - - - - - - - - - -
Conference Number:
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/adhoc/joindemo.gsp b/bigbluebutton-web/grails-app/views/adhoc/joindemo.gsp deleted file mode 100644 index c74bea23d7..0000000000 --- a/bigbluebutton-web/grails-app/views/adhoc/joindemo.gsp +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Login - - - -
${flash.message}
- -
- - - - - - - - - - - - - - -
Fullname:
Auth Token:
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/adhoc/show.gsp b/bigbluebutton-web/grails-app/views/adhoc/show.gsp deleted file mode 100644 index 8362ebf6b9..0000000000 --- a/bigbluebutton-web/grails-app/views/adhoc/show.gsp +++ /dev/null @@ -1,46 +0,0 @@ - - - - - Login - - - -
${flash.message}
- - - - - - - - - - - - - - - - -
Voice Bridge Number:${voicebridge}
Moderator Token${modToken}
Viewer Token${viewerToken}
-
- - - - - - - - - - - - - - -
Enter your name Fullname:
Enter Token:
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/attendees/create.gsp b/bigbluebutton-web/grails-app/views/attendees/create.gsp deleted file mode 100644 index 7ea1e30f1d..0000000000 --- a/bigbluebutton-web/grails-app/views/attendees/create.gsp +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - Create Attendees - - -
- Home - Attendees List -
-
-

Create Attendees

- -
${flash.message}
- - -
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
- -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/attendees/edit.gsp b/bigbluebutton-web/grails-app/views/attendees/edit.gsp deleted file mode 100644 index 0d568db5d2..0000000000 --- a/bigbluebutton-web/grails-app/views/attendees/edit.gsp +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - Edit Attendees - - -
- Home - Attendees List - New Attendees -
-
-

Edit Attendees

- -
${flash.message}
- - -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
- - -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/attendees/list.gsp b/bigbluebutton-web/grails-app/views/attendees/list.gsp deleted file mode 100644 index 92db844536..0000000000 --- a/bigbluebutton-web/grails-app/views/attendees/list.gsp +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - Attendees List - - -
- Home - New Attendees -
-
-

Attendees List

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${attendees.id?.encodeAsHTML()}${attendees.callerName?.encodeAsHTML()}${attendees.callerNumber?.encodeAsHTML()}${attendees.channelId?.encodeAsHTML()}${attendees.conferenceNumber?.encodeAsHTML()}${attendees.dateJoined?.encodeAsHTML()}
-
-
- -
-
- - diff --git a/bigbluebutton-web/grails-app/views/attendees/show.gsp b/bigbluebutton-web/grails-app/views/attendees/show.gsp deleted file mode 100644 index c936f641bf..0000000000 --- a/bigbluebutton-web/grails-app/views/attendees/show.gsp +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - Show Attendees - - -
- Home - Attendees List - New Attendees -
-
-

Show Attendees

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Id:${attendees.id}
Caller Name:${attendees.callerName}
Caller Number:${attendees.callerNumber}
Channel Id:${attendees.channelId}
Conference Number:${attendees.conferenceNumber}
Date Joined:${attendees.dateJoined}
Date Left:${attendees.dateLeft}
User Number:${attendees.userNumber}
-
-
- - - - - -
-
- - diff --git a/bigbluebutton-web/grails-app/views/auth/login.gsp b/bigbluebutton-web/grails-app/views/auth/login.gsp deleted file mode 100644 index 1bdd3b6b58..0000000000 --- a/bigbluebutton-web/grails-app/views/auth/login.gsp +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Login - - - -
${flash.message}
- - - - - - - - - - - - - - - - - - - - - - - - - -
 To login, username: admin@test.com password: admin
Username:
Password:
Remember me?:
-
- - - diff --git a/bigbluebutton-web/grails-app/views/conference/_instructions.gsp b/bigbluebutton-web/grails-app/views/conference/_instructions.gsp deleted file mode 100644 index 84b2fd7ca1..0000000000 --- a/bigbluebutton-web/grails-app/views/conference/_instructions.gsp +++ /dev/null @@ -1,26 +0,0 @@ - -
-
-
-
-
-

Creating a conference call

-
    -
  1. Click on 'New Conference'
    2. -
  2. Create the details of the conference
    3. -
  3. Click on 'Create'
    4. -
  4. Copy and paste the 'Invitation email' to a new mail message in your personal mailbox.
    5. -
  5. Invite people to join your conference call (up to 20 people)
    6. -
- -

- For Outlook users: (optional) - -

For great results using your Outlook Calendar, copy and paste the 'Invitation Text' to your calendar and invite people to join the conference.

- -

Your invitees will receive the invitation, it will be added to their calendar and they will be able to RSVP and receive a conference reminder.

-
-

***Please remember that not all people have access to Outlook.

-
-
- \ No newline at end of file diff --git a/bigbluebutton-web/grails-app/views/conference/create.gsp b/bigbluebutton-web/grails-app/views/conference/create.gsp deleted file mode 100644 index 285fdce51e..0000000000 --- a/bigbluebutton-web/grails-app/views/conference/create.gsp +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - Create Conference - - -
- Home - Conference List -
-
-

Create Conference

- -
${flash.message}
- - -
- -
- - -
- - - - - - - - - - - -
- - - -
- - - -
-
-
- -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/conference/edit.gsp b/bigbluebutton-web/grails-app/views/conference/edit.gsp deleted file mode 100644 index 97636f5460..0000000000 --- a/bigbluebutton-web/grails-app/views/conference/edit.gsp +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - Edit Conference - - -
- Home - Your Conferences - New Conference -
-
-

Edit Conference

- -
${flash.message}
- - -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - ${conference?.dateCreated} -
- - - ${conference?.lastUpdated} -
- - - ${conference.createdBy} -
-
-
- - -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/conference/list.gsp b/bigbluebutton-web/grails-app/views/conference/list.gsp deleted file mode 100644 index cef72c8a20..0000000000 --- a/bigbluebutton-web/grails-app/views/conference/list.gsp +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - Conference List - - -
- Home - New Conference -
-
-

Your Conferences

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - -
${fieldValue(bean:conference, field:'name')}${fieldValue(bean:conference, field:'dateCreated')}${fieldValue(bean:conference, field:'lastUpdated')}
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/conference/show.gsp b/bigbluebutton-web/grails-app/views/conference/show.gsp deleted file mode 100644 index 7b9a6d0914..0000000000 --- a/bigbluebutton-web/grails-app/views/conference/show.gsp +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - Show Conference - - -
- Home - Your Conferences - New Conference - Schedule Session -
-
-

Show Conference

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Created By:${fieldValue(bean:conference, field:'createdBy')}
Conference Name:${fieldValue(bean:conference, field:'name')}
Conference Number:${fieldValue(bean:conference, field:'conferenceNumber')}
Date Created:${fieldValue(bean:conference, field:'dateCreated')}
Last Updated:${fieldValue(bean:conference, field:'lastUpdated')}
-
-
- - - - - -
-
-
-

Scheduled Sessions

-
- - - - - - - - - - - - - - - - - - - -
${schedSession.name?.encodeAsHTML()} - display -
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/join/login.gsp b/bigbluebutton-web/grails-app/views/join/login.gsp deleted file mode 100644 index 5a3bf0ccca..0000000000 --- a/bigbluebutton-web/grails-app/views/join/login.gsp +++ /dev/null @@ -1,34 +0,0 @@ - - - - - Login - - - -
${flash.message}
- - - - - - - - - - - - - - - - - - - - -
Fullname:
Conference:
Password:
-
- - - diff --git a/bigbluebutton-web/grails-app/views/publicScheduledSession/joinIn.gsp b/bigbluebutton-web/grails-app/views/publicScheduledSession/joinIn.gsp deleted file mode 100644 index 85e649b990..0000000000 --- a/bigbluebutton-web/grails-app/views/publicScheduledSession/joinIn.gsp +++ /dev/null @@ -1,57 +0,0 @@ - - - - - Login - - - -
${flash.message}
- - - - - - - - - - - - - - - - - -
Conference Name:${info.name}
Conference Number:${id}
Description:${info.description}
- - - - - - - - - - - - - - - - - - - - - - - - - -
Fullname:
Conference Number:
Password:
-
- - - diff --git a/bigbluebutton-web/grails-app/views/publicScheduledSession/show.gsp b/bigbluebutton-web/grails-app/views/publicScheduledSession/show.gsp deleted file mode 100644 index fdd334651a..0000000000 --- a/bigbluebutton-web/grails-app/views/publicScheduledSession/show.gsp +++ /dev/null @@ -1,96 +0,0 @@ - -<%@ page import="org.bigbluebutton.web.domain.ScheduledSession" %> - - - - - Show ScheduledSession - - -
- Home -
-
-

Information on ${scheduledSessionInstance.name}

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Session:${fieldValue(bean:scheduledSessionInstance, field:'name')}
Description:${fieldValue(bean:scheduledSessionInstance, field:'description')}
Voice Conference Bridge:${fieldValue(bean:scheduledSessionInstance, field:'voiceConferenceBridge')}
Link: - - CLICK HERE TO JOIN - - - CLICK HERE TO PLAY - - -
Start Date Time: - -
End Date Time: - -
Conference: - ${scheduledSessionInstance?.conference?.name.encodeAsHTML()}
NOTE: - If the client does not load after clicking JOIN, refresh button your browser.
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/publicScheduledSession/signIn.gsp b/bigbluebutton-web/grails-app/views/publicScheduledSession/signIn.gsp deleted file mode 100644 index 9219e0f71e..0000000000 --- a/bigbluebutton-web/grails-app/views/publicScheduledSession/signIn.gsp +++ /dev/null @@ -1,14 +0,0 @@ - -<%@ page import="org.bigbluebutton.web.domain.ScheduledSession" %> - - - - - Show ScheduledSession - - -
- Home -
- - diff --git a/bigbluebutton-web/grails-app/views/scheduledSession/create.gsp b/bigbluebutton-web/grails-app/views/scheduledSession/create.gsp deleted file mode 100644 index ee54aa65bf..0000000000 --- a/bigbluebutton-web/grails-app/views/scheduledSession/create.gsp +++ /dev/null @@ -1,139 +0,0 @@ - -<%@ page import="org.bigbluebutton.web.domain.ScheduledSession" %> - - - - - Create ScheduledSession - - -
- Home - ScheduledSession List -
-
-

Create ScheduledSession

- -
${flash.message}
- - -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
- -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/scheduledSession/edit.gsp b/bigbluebutton-web/grails-app/views/scheduledSession/edit.gsp deleted file mode 100644 index 8d710f8791..0000000000 --- a/bigbluebutton-web/grails-app/views/scheduledSession/edit.gsp +++ /dev/null @@ -1,177 +0,0 @@ - -<%@ page import="org.bigbluebutton.web.domain.ScheduledSession" %> - - - - - Edit ScheduledSession - - -
- Home - ScheduledSession List -
-
-

Edit ScheduledSession

- -
${flash.message}
- - -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - ${scheduledSessionInstance?.conference?.name} -
- - - ${fieldValue(bean:scheduledSessionInstance,field:'createdBy')} -
- - - ${scheduledSessionInstance?.dateCreated} -
- - - ${scheduledSessionInstance?.lastUpdated} -
- - - ${fieldValue(bean:scheduledSessionInstance,field:'modifiedBy')} -
-
-
- - -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/scheduledSession/list.gsp b/bigbluebutton-web/grails-app/views/scheduledSession/list.gsp deleted file mode 100644 index 0fc2d3d620..0000000000 --- a/bigbluebutton-web/grails-app/views/scheduledSession/list.gsp +++ /dev/null @@ -1,49 +0,0 @@ - -<%@ page import="org.bigbluebutton.web.domain.ScheduledSession" %> - - - - - ScheduledSession List - - -
- Home -
-
-

ScheduledSession List

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - -
${fieldValue(bean:scheduledSessionInstance, field:'name')}${fieldValue(bean:scheduledSessionInstance, field:'startDateTime')}${fieldValue(bean:scheduledSessionInstance, field:'endDateTime')}
-
-
- -
-
- - diff --git a/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp b/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp deleted file mode 100644 index 18d61b5228..0000000000 --- a/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp +++ /dev/null @@ -1,130 +0,0 @@ - -<%@ page import="org.bigbluebutton.web.domain.ScheduledSession" %> - - - - - Show ScheduledSession - - -
- Home - ScheduledSession List -
-
-

Show ScheduledSession

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:${fieldValue(bean:scheduledSessionInstance, field:'name')}
Description:${fieldValue(bean:scheduledSessionInstance, field:'description')}
Voice Conference Bridge:${fieldValue(bean:scheduledSessionInstance, field:'voiceConferenceBridge')}
Link: - ${hostUrl}/bigbluebutton/conference-session/joinIn/${fieldValue(bean:scheduledSessionInstance, field:'voiceConferenceBridge')} (JOIN) -
Conference: - - ${scheduledSessionInstance?.conference?.encodeAsHTML()} - -
Moderator Password:${fieldValue(bean:scheduledSessionInstance, field:'moderatorPassword')}
Attendee Password:${fieldValue(bean:scheduledSessionInstance, field:'attendeePassword')}
Start Date Time:${fieldValue(bean:scheduledSessionInstance, field:'startDateTime')}
End Date Time:${fieldValue(bean:scheduledSessionInstance, field:'endDateTime')}
Created By:${fieldValue(bean:scheduledSessionInstance, field:'createdBy')}
Date Created:${fieldValue(bean:scheduledSessionInstance, field:'dateCreated')}
Last Updated:${fieldValue(bean:scheduledSessionInstance, field:'lastUpdated')}
Modified By:${fieldValue(bean:scheduledSessionInstance, field:'modifiedBy')}
-
-
- - - - - -
-
- - diff --git a/bigbluebutton-web/grails-app/views/user/changepassword.gsp b/bigbluebutton-web/grails-app/views/user/changepassword.gsp deleted file mode 100644 index 95efd7e7a9..0000000000 --- a/bigbluebutton-web/grails-app/views/user/changepassword.gsp +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - Edit User - - -
- Home - User List - New User -
-
-

Edit User

- -
${flash.message}
- - -
- -
- - - -
- - - - - - - - -
- - - -
-
-
- - Cancel -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/user/create.gsp b/bigbluebutton-web/grails-app/views/user/create.gsp deleted file mode 100644 index d55d8a5be4..0000000000 --- a/bigbluebutton-web/grails-app/views/user/create.gsp +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - Create User - - -
- Home - User List -
-
-

Create User

- -
${flash.message}
- - -
- -
- - -
- - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
-
-
- -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/user/edit.gsp b/bigbluebutton-web/grails-app/views/user/edit.gsp deleted file mode 100644 index 57a889cb6d..0000000000 --- a/bigbluebutton-web/grails-app/views/user/edit.gsp +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - Edit User - - -
- Home - User List - New User -
-
-

Edit User

- -
${flash.message}
- - -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - ${userInstance?.dateCreated} -
- - - ${userInstance?.lastUpdated} -
-
-
- - -
- -
- - diff --git a/bigbluebutton-web/grails-app/views/user/list.gsp b/bigbluebutton-web/grails-app/views/user/list.gsp deleted file mode 100644 index 96839160b0..0000000000 --- a/bigbluebutton-web/grails-app/views/user/list.gsp +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - User List - - -
- Home - New User -
-
-

User List

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Conferences
${fieldValue(bean:userInstance, field:'id')}${fieldValue(bean:userInstance, field:'username')}${fieldValue(bean:userInstance, field:'fullName')}${fieldValue(bean:userInstance, field:'dateCreated')}
-
-
- - diff --git a/bigbluebutton-web/grails-app/views/user/show.gsp b/bigbluebutton-web/grails-app/views/user/show.gsp deleted file mode 100644 index b017c7ab16..0000000000 --- a/bigbluebutton-web/grails-app/views/user/show.gsp +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - Show User - - -
- Home - User List - New User -
-
-

Show User

- -
${flash.message}
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Username:${fieldValue(bean:userInstance, field:'username')}
Full Name:${fieldValue(bean:userInstance, field:'fullName')}
Date Created:${fieldValue(bean:userInstance, field:'dateCreated')}
Last Updated:${fieldValue(bean:userInstance, field:'lastUpdated')}
PasswordChange
-
-
- - - - - -
-
- - diff --git a/bigbluebutton-web/web-app/index.gsp b/bigbluebutton-web/web-app/index.gsp old mode 100644 new mode 100755 index 1d81c199c6..a31d465715 --- a/bigbluebutton-web/web-app/index.gsp +++ b/bigbluebutton-web/web-app/index.gsp @@ -1 +1 @@ -<%response.sendRedirect(request.getContextPath()+"/conference/list");%> \ No newline at end of file +This page is no longer available, please use the api