29e94500c4
Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
40 lines
982 B
Groovy
Executable File
40 lines
982 B
Groovy
Executable File
apply plugin: 'java'
|
|
|
|
sourceCompatibility=1.6
|
|
targetCompatibility=1.6
|
|
|
|
ant.importBuild 'build.xml'
|
|
|
|
version = 'unsigned-0.8.1'
|
|
archivesBaseName = 'bbb-deskshare-applet'
|
|
|
|
dependencies {
|
|
compile 'org/testng:testng:5.8@jar'
|
|
compile project(':common')
|
|
compile 'net/jcip:jcip-annotations:1.0@jar'
|
|
compile 'com/sun/java:plugin:1.6.0_16@jar'
|
|
}
|
|
|
|
test {
|
|
useTestNG()
|
|
}
|
|
|
|
|
|
jar.doFirst {
|
|
println '''
|
|
/**
|
|
* Combine the common classes into the applet's jar because we
|
|
* do not want to sign and manage 2 jar files.
|
|
**/'''
|
|
jar.from zipTree('../common/build/libs/bbb-deskshare-common-0.8.jar')
|
|
}
|
|
|
|
jar {
|
|
manifest.mainAttributes("Permissions": "all-permissions")
|
|
manifest.mainAttributes("Codebase": "*")
|
|
manifest.mainAttributes("Application-Name": "BigBlueButton Deskshare Applet")
|
|
manifest.mainAttributes("Application-Library-Allowable-Codebase": "*")
|
|
manifest.mainAttributes("Caller-Allowable-Codebase": "*")
|
|
manifest.mainAttributes("Trusted-Only": "true")
|
|
}
|