Correct Jar/War split for addressbook, snark and i2ptunnel

apps/addressbook/build.gradle

@@ -13,6 +13,10 @@ dependencies {
     providedCompile project(':apps:jetty')
 }
 
+jar {
+    exclude { it.name == 'Servlet.class' }
+}
+
 war {
     webXml = file('web.xml')
 }

apps/i2psnark/build.gradle

@@ -4,16 +4,37 @@ sourceSets {
     main {
         java {
             srcDir 'java/src'
+            include 'org/klomp/snark/web/**'
+        }
+    }
+    jar {
+        java {
+            srcDir 'java/src'
+            exclude 'org/klomp/snark/web'
         }
     }
 }
 
 dependencies {
-    compile project(':core')
+    jarCompile project(':core')
+    jarCompile project(':apps:ministreaming')
+    providedCompile sourceSets.jar.output
     providedCompile project(':apps:ministreaming')
     providedCompile project(':apps:jetty')
 }
 
+task i2psnarkJar(type: Jar) {
+    from sourceSets.jar.output
+    manifest {
+        attributes 'Main-Class': 'org.klomp.snark.Snark'
+        attributes 'Class-Path': 'i2p.jar mstreaming.jar streaming.jar'
+    }
+}
+
+artifacts {
+    archives i2psnarkJar
+}
+
 war {
     into '.icons', {
         from 'icons'

apps/i2ptunnel/build.gradle

@@ -4,6 +4,15 @@ sourceSets {
     main {
         java {
             srcDir 'java/src'
+            include 'net/i2p/i2ptunnel/web/EditBean.java'
+            include 'net/i2p/i2ptunnel/web/IndexBean.java'
+        }
+    }
+    jar {
+        java {
+            srcDir 'java/src'
+            exclude 'net/i2p/i2ptunnel/web/EditBean.java'
+            exclude 'net/i2p/i2ptunnel/web/IndexBean.java'
         }
     }
     test {
@@ -14,11 +23,24 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':core')
+    jarCompile project(':core')
-    providedCompile project(':apps:ministreaming')
+    jarCompile project(':apps:ministreaming')
+    providedCompile sourceSets.jar.output
     providedCompile project(':apps:jetty')
 }
 
+task i2ptunnelJar(type: Jar) {
+    from sourceSets.jar.output
+    manifest {
+        attributes 'Main-Class': 'net.i2p.i2ptunnel.I2PTunnel'
+        attributes 'Class-Path': 'i2p.jar mstreaming.jar'
+    }
+}
+
+artifacts {
+    archives i2ptunnelJar
+}
+
 war {
     from 'jsp'
     exclude 'jsp/web.xml'