36bbcc06d6
Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java bbb-video/.classpath bbb-video/build.gradle bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java bbb-video/src/main/webapp/WEB-INF/red5-web.xml bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/es_LA/bbbResources.properties bigbluebutton-client/resources/config.xml.template bigbluebutton-client/resources/prod/MconfLive.html bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar bigbluebutton-client/src/BigBlueButton.mxml bigbluebutton-client/src/SharedNotesModule.mxml bigbluebutton-client/src/org/bigbluebutton/common/Images.as bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as bigbluebutton-config/bigbluebutton-release bigbluebutton-config/bin/bbb-conf bigbluebutton-config/web/index.html bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
121 lines
4.4 KiB
Groovy
Executable File
121 lines
4.4 KiB
Groovy
Executable File
apply plugin: 'java'
|
|
apply plugin: 'war'
|
|
apply plugin: 'eclipse'
|
|
|
|
version = '0.9.0'
|
|
jar.enabled = true
|
|
archivesBaseName = 'video'
|
|
|
|
task resolveDeps(type: Copy) {
|
|
into('lib')
|
|
from configurations.default
|
|
from configurations.default.allArtifacts.file
|
|
}
|
|
|
|
repositories {
|
|
mavenCentral()
|
|
mavenLocal()
|
|
add(new org.apache.ivy.plugins.resolver.ChainResolver()) {
|
|
name = 'remote'
|
|
returnFirst = true
|
|
add(new org.apache.ivy.plugins.resolver.URLResolver()) {
|
|
name = "googlecode"
|
|
addArtifactPattern "http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
|
|
addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
|
|
}
|
|
add(new org.apache.ivy.plugins.resolver.URLResolver()) {
|
|
name = "blindside-repos"
|
|
addArtifactPattern "http://blindside.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
|
|
addArtifactPattern "http://blindside.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
|
|
}
|
|
add(new org.apache.ivy.plugins.resolver.URLResolver()) {
|
|
name = "testng_ibiblio_maven2"
|
|
m2compatible = true
|
|
addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact](-[revision])-jdk15.[ext]"
|
|
addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision])-jdk15.[ext]"
|
|
}
|
|
add(new org.apache.ivy.plugins.resolver.URLResolver()) {
|
|
name = "spring-bundles"
|
|
m2compatible = true
|
|
addArtifactPattern "http://repository.springsource.com/maven/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
|
|
addArtifactPattern "http://repository.springsource.com/maven/bundles/release/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
|
|
}
|
|
mavenRepo name: "jboss", urls: "http://repository.jboss.org/nexus/content/groups/public-jboss"
|
|
mavenRepo name: "sonatype-snapshot", urls: "http://oss.sonatype.org/content/repositories/snapshots"
|
|
mavenRepo name: "sonatype-releases", urls: "http://oss.sonatype.org/content/repositories/releases"
|
|
|
|
}
|
|
}
|
|
|
|
dependencies {
|
|
// Servlet
|
|
providedCompile 'javax.servlet:servlet-api:2.5@jar'
|
|
|
|
// Mina
|
|
providedCompile 'org.apache.mina:mina-core:2.0.8@jar'
|
|
providedCompile 'org.apache.mina:mina-integration-beans:2.0.8@jar'
|
|
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
|
|
|
|
// Spring
|
|
providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar'
|
|
providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar'
|
|
providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
|
|
providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
|
|
|
|
// Red5
|
|
providedCompile 'org.red5:red5-server:1.0.6-SNAPSHOT@jar'
|
|
providedCompile 'org.red5:red5-server-common:1.0.6-SNAPSHOT@jar'
|
|
providedCompile 'org.red5:red5-io:1.0.6-SNAPSHOT@jar'
|
|
providedCompile 'org.red5:red5-client:1.0.6-SNAPSHOT@jar'
|
|
|
|
// Logging
|
|
providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
|
|
providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar'
|
|
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar'
|
|
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
|
|
providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
|
|
providedCompile 'org.slf4j:slf4j-api:1.7.9@jar'
|
|
|
|
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
|
|
// Otherwise we get exception on aop utils class not found.
|
|
providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar'
|
|
compile 'aopalliance:aopalliance:1.0@jar'
|
|
|
|
// Java Concurrency In Practice
|
|
providedCompile 'net.jcip:jcip-annotations:1.0@jar'
|
|
|
|
// Testing
|
|
// compile 'org.testng:testng:5.8@jar'
|
|
compile 'org.easymock:easymock:2.4@jar'
|
|
|
|
//redis
|
|
compile 'redis.clients:jedis:2.0.0'
|
|
providedCompile 'commons-pool:commons-pool:1.5.6'
|
|
compile 'com.google.code.gson:gson:1.7.1'
|
|
|
|
compile 'org.bigbluebutton:bbb-common-message:0.0.5'
|
|
|
|
// Needed for StringUtils
|
|
providedCompile 'org.apache.commons:commons-lang3:3.1@jar'
|
|
}
|
|
|
|
test {
|
|
useTestNG()
|
|
}
|
|
|
|
war.doLast {
|
|
ant.unzip(src: war.archivePath, dest: "$buildDir/video")
|
|
}
|
|
|
|
|
|
task deploy() << {
|
|
def red5AppsDir = '/usr/share/red5/webapps'
|
|
def videoDir = new File("${red5AppsDir}/video")
|
|
if (videoDir.exists()) ant.delete(dir: videoDir)
|
|
ant.mkdir(dir: videoDir)
|
|
ant.copy(todir: videoDir) {
|
|
fileset(dir: "$buildDir/video")
|
|
}
|
|
}
|
|
|