- build desktop sharing....need to put file-uploads jar into red5/lib

sebelk · Feb 28, 2013 · e689d1f · e689d1f
1 parent bc3078e
commit e689d1f
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 51 deletions.
diff --git a/deskshare/app/build.gradle b/deskshare/app/build.gradle
@@ -9,32 +9,56 @@ jar.enabled = true
 archivesBaseName = 'bbb-deskshare-app' 
 
 dependencies {	  
-    providedCompile 'javax.servlet:servlet-api:2.5@jar'
+	// Servlet
+	providedCompile 'javax.servlet:servlet-api:2.5@jar'
 
-	providedCompile 'mina:mina-core:2.0.4@jar' 
-
+	// Mina
+	providedCompile 'org.apache.mina:mina-core:2.0.7@jar'
+	providedCompile 'org.apache.mina:mina-integration-beans:2.0.7@jar'
+	providedCompile 'org.apache.mina:mina-integration-jmx:2.0.7@jar'
 
-	// Spring
-	providedCompile 'org.springframework:spring-web:3.0.6.RELEASE@jar'
-	providedCompile  'org.springframework:spring-beans:3.0.6.RELEASE@jar'
-	providedCompile 'org.springframework:spring-context:3.0.6.RELEASE@jar'
-	providedCompile 'org.springframework:spring-core:3.0.6.RELEASE@jar'
-	compile 'org.springframework:spring-webmvc:3.0.6.RELEASE@jar'
-		
-	providedCompile 'org/red5:red5:1.0r4415@jar'
+	// Spring 
+	providedCompile 'org.springframework:spring-web:3.1.1.RELEASE@jar' 
+	providedCompile  'org.springframework:spring-beans:3.1.1.RELEASE@jar'
+	providedCompile 'org.springframework:spring-context:3.1.1.RELEASE@jar'
+	providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
+
+	// Red5
+	providedCompile 'org/red5:red5:1.0r4573@jar'
 
-
 	// Logging
-	providedCompile 'org.slf4j:com.springsource.slf4j.api:1.6.1@jar'
-	providedCompile 'org.slf4j:com.springsource.slf4j.bridge:1.6.1@jar'
-	providedCompile ':logback-core:0.9.28@jar'
-	providedCompile ':logback-classic:0.9.28@jar'
-	providedCompile ':log4j-over-slf4j:1.6.1@jar'
-	providedCompile ':jcl-over-slf4j:1.6.1@jar'
-	providedCompile ':jul-to-slf4j:1.6.1@jar'
+	providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'
+	providedCompile 'ch.qos.logback:logback-classic:1.0.9@jar'
+	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.2@jar' 
+	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
+	providedCompile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
+    providedCompile 'org.slf4j:slf4j-api:1.7.2@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:3.1.1.RELEASE@jar'
+	providedCompile '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'
+
+	// Testing
+	testRuntime 'org/testng:testng:5.8@jar'
+	testRuntime 'org.easymock:easymock:2.4@jar'
+
+	// Tunnelling servlet
+	compile 'org.springframework:spring-webmvc:3.1.1.RELEASE@jar'
+
 	compile project(':common')
-    compile 'commons-fileupload:commons-fileupload:1.2.2@jar'
+
+	// Need to put commons file-upload in red5/lib dir. Otherwise, we get an
+	// java.lang.NoClassDefFoundError: org/apache/commons/fileupload/FileItemFactory
+	// ralam (Feb 27, 2013) 
+    providedCompile 'commons-fileupload:commons-fileupload:1.2.2@jar'
 	compile 'commons-io:commons-io:2.1@jar' 
 
     // Libraries needed to run the scala tools
@@ -49,14 +73,6 @@ dependencies {
     compile 'org.scala-lang:scala-library:2.9.2'   
     compile 'net.lag:configgy:2.0.0'
 
-        // Testing
-    compile 'org.testng:testng:5.8@jar' 
-    compile 'org.easymock:easymock:2.4@jar'
-
-	// Testing
-	testRuntime 'org/testng:testng:5.8@jar'
-	testRuntime 'org.easymock:easymock:2.4@jar'
-
         //redis
 	compile 'redis.clients:jedis:1.5.1'
 	compile 'commons-pool:commons-pool:1.5.6'

diff --git a/deskshare/build.gradle b/deskshare/build.gradle
@@ -62,35 +62,38 @@ dependencies {
 	compile 'javax.servlet:servlet-api:2.5@jar'
 
 	// Mina
-	compile 'mina:mina-core:2.0.4@jar'
+	compile 'org.apache.mina:mina-core:2.0.7@jar'
+	compile 'org.apache.mina:mina-integration-beans:2.0.7@jar'
+	compile 'org.apache.mina:mina-integration-jmx:2.0.7@jar'
 
-	// Spring
-	compile 'org.springframework:spring-web:3.0.6.RELEASE@jar'
-	compile  'org.springframework:spring-beans:3.0.6.RELEASE@jar'
-	compile 'org.springframework:spring-context:3.0.6.RELEASE@jar'
-	compile 'org.springframework:spring-core:3.0.6.RELEASE@jar'
-	compile 'org.springframework:spring-webmvc:3.0.6.RELEASE@jar'
-
+	// Spring 
+	compile 'org.springframework:spring-web:3.1.1.RELEASE@jar' 
+	compile  'org.springframework:spring-beans:3.1.1.RELEASE@jar'
+	compile 'org.springframework:spring-context:3.1.1.RELEASE@jar'
+	compile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
 
 	// Red5
 	compile 'org/red5:red5:1.0r4573@jar'
 
 	// Logging
-	compile 'org.slf4j:com.springsource.slf4j.api:1.6.1@jar'
-	compile 'org.slf4j:com.springsource.slf4j.bridge:1.6.1@jar'
-	compile ':logback-core:0.9.28@jar'
-	compile ':logback-classic:0.9.28@jar'
-	compile ':log4j-over-slf4j:1.6.1@jar'
-	compile ':jcl-over-slf4j:1.6.1@jar'
-	compile ':jul-to-slf4j:1.6.1@jar'
-
-	// Testing
-	compile 'org.testng:testng:5.8@jar'
-	compile 'org.easymock:easymock:2.4@jar'
-
-	// Testing
-	testRuntime 'org/testng:testng:5.8@jar'
-	testRuntime 'org.easymock:easymock:2.4@jar'
+	compile 'ch.qos.logback:logback-core:1.0.9@jar'
+	compile 'ch.qos.logback:logback-classic:1.0.9@jar'
+	compile 'org.slf4j:log4j-over-slf4j:1.7.2@jar' 
+	compile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
+	compile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
+    compile 'org.slf4j:slf4j-api:1.7.2@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.
+	compile 'org.springframework:spring-aop:3.0.6.RELEASE@jar'
+	compile 'aopalliance:aopalliance:1.0@jar'
+
+    // Java Concurrency In Practice
+    compile 'net.jcip:jcip-annotations:1.0@jar'
+
+    // Testing
+    compile 'org.testng:testng:5.8@jar' 
+    compile 'org.easymock:easymock:2.4@jar'
 
 	compile project(':common')
     compile 'commons-fileupload:commons-fileupload:1.2.2@jar'