propagate from branch 'i2p.i2p' (head d3ba02961713c42005f60442d7816cefa3dcf46a)

to branch 'i2p.i2p.str4d.test2' (head fbda38b84fe469dba05367115d2c26dee65fc5f4)

apps/BOB/build.gradle

@@ -0,0 +1,12 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:ministreaming')
+}

apps/addressbook/build.gradle

@@ -0,0 +1,12 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:jetty')
+}

apps/desktopgui/build.gradle

@@ -0,0 +1,13 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':router')
+    compile project(':installer')
+}

apps/i2psnark/build.gradle

@@ -0,0 +1,43 @@
+apply plugin: 'war'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:systray')
+    providedCompile project(':apps:ministreaming')
+    providedCompile project(':apps:jetty')
+}
+
+task i2psnarkJar(type: Jar) {
+    from sourceSets.main.output
+    exclude 'org/klomp/snark/standalone/**'
+    exclude 'org/klomp/snark/web/**'
+    manifest {
+        attributes 'Main-Class': 'org.klomp.snark.Snark'
+        attributes 'Class-Path': 'i2p.jar mstreaming.jar streaming.jar'
+    }
+}
+
+// TODO: standalone jar.  This is rather involved!
+
+artifacts {
+    archives i2psnarkJar
+}
+
+war {
+    into '.icons', {
+        from 'icons'
+    }
+    webInf {
+        into 'classes/org/klomp/snark/web'
+        from 'mime.properties'
+    }
+    webXml = file('web.xml')
+}

apps/i2ptunnel/build.gradle

@@ -0,0 +1,59 @@
+apply plugin: 'war'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+    test {
+        java {
+            srcDir 'java/test/junit'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:ministreaming')
+    providedCompile project(':apps:jetty')
+}
+
+task i2ptunnelJar(type: Jar) {
+    from sourceSets.main.output 
+    exclude '**/ui/*.class'
+    exclude '**/EditBean.class'
+    exclude '**/IndexBean.class'
+    manifest {
+        attributes 'Main-Class': 'net.i2p.i2ptunnel.I2PTunnel'
+        attributes 'Class-Path': 'i2p.jar mstreaming.jar'
+    }
+}
+
+task tempBeansJar(type: Jar) {
+    from sourceSets.main.output
+    include '**/EditBean.class'
+    include '**/ui/*.class'
+    include '**/IndexBean.class'
+    baseName = 'temp-beans'
+}
+
+task uiJar(type: Jar) {
+    baseName = 'i2ptunnel-ui'
+    from sourceSets.main.output
+    include '**/ui/*.class'
+    manifest {
+        attributes 'Class-Path' : 'i2p.jar mstreaming.jar i2ptunnel.jar'
+    }
+}
+
+artifacts {
+    archives i2ptunnelJar, tempBeansJar, uiJar
+}
+
+war {
+    from 'jsp'
+    exclude 'jsp/web.xml'
+    webXml = file('jsp/web.xml')
+}
+

apps/jetty/build.gradle

@@ -0,0 +1,34 @@
+archivesBaseName = 'jetty-i2p'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    ext.jettyVersion = '9.2.21.v20170120'
+    ext.tomcatVersion = '8.0.33'
+    compile project(':core')
+    compile 'commons-logging:commons-logging:1.0.4'
+    compile 'org.eclipse.jetty.orbit:javax.servlet.jsp:2.2.0.v201112011158'
+    compile 'org.eclipse.jetty:jetty-http:' + ext.jettyVersion
+    compile 'org.eclipse.jetty:jetty-io:' + ext.jettyVersion
+    compile 'org.eclipse.jetty:jetty-security:' + ext.jettyVersion
+    compile 'org.eclipse.jetty:jetty-server:' + ext.jettyVersion
+    compile 'org.eclipse.jetty:jetty-servlet:' + ext.jettyVersion
+    compile 'org.eclipse.jetty:jetty-util:' + ext.jettyVersion
+    compile 'org.eclipse.jetty:jetty-xml:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:apache-jsp:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-continuation:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-deploy:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-jmx:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-rewrite:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-servlets:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-start:' + ext.jettyVersion
+    runtime 'org.eclipse.jetty:jetty-webapp:' + ext.jettyVersion
+    runtime 'org.mortbay.jasper:apache-el:' + ext.tomcatVersion
+    runtime 'org.mortbay.jasper:apache-jsp:' + ext.tomcatVersion
+}

apps/jrobin/build.gradle

@@ -0,0 +1,11 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+}

apps/ministreaming/build.gradle

@@ -0,0 +1,32 @@
+apply plugin: 'java-library'
+
+archivesBaseName = 'mstreaming'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+    test {
+        java {
+            srcDir 'java/test/junit'
+        }
+    }
+}
+
+dependencies {
+    api project(':core')
+}
+
+configurations {
+    tests
+}
+task testJar(type: Jar) {
+    baseName = 'mstreaming-test'
+    dependsOn classes
+    from sourceSets.test.output
+}
+artifacts {
+    tests testJar
+}

apps/routerconsole/build.gradle

@@ -0,0 +1,39 @@
+apply plugin: 'war'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':router')
+    compile project(':installer')
+    providedCompile project(':apps:desktopgui')
+    providedCompile project(':apps:systray')
+    providedCompile project(':apps:jetty')
+    providedCompile project(':apps:jrobin')
+}
+
+jar {
+    manifest {
+        // Top level installer will rename to jrobin.jar
+        // DTG added in 0.8.4, not in the classpath for very old installs,
+        // before we changed wrapper.config to specify *
+        // very old installs don't have i2psnark,jstl,standard in the classpath...
+        // not added in WebAppConfiguration any more
+        // All new jetty 7 jars should have been in 0.9.6, added in 0.9.7
+        attributes 'Class-Path': 'i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar'
+    }
+}
+
+war {
+    from 'jsp'
+    // Remove classes from the classpath, they are in the jar.
+    // If we return to precompiling jsps this needs to change.
+    classpath = []
+    webXml = file('jsp/web.xml')
+}

apps/sam/build.gradle

@@ -0,0 +1,17 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+    test {
+        java {
+            srcDir 'java/test'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:ministreaming')
+}

apps/streaming/build.gradle

@@ -0,0 +1,20 @@
+apply plugin: 'java-library'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+    test {
+        java {
+            srcDir 'java/test/junit'
+        }
+    }
+}
+
+dependencies {
+    api project(':core')
+    api project(':apps:ministreaming')
+    testImplementation project(path: ':apps:ministreaming', configuration: 'tests')
+}

apps/susidns/build.gradle

@@ -0,0 +1,20 @@
+apply plugin: 'war'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    providedCompile project(':apps:jetty')
+}
+
+war {
+    from 'src/jsp'
+    from 'src/index.html'
+    webXml = file('src/WEB-INF/web-template.xml')
+}

apps/susimail/build.gradle

@@ -0,0 +1,27 @@
+apply plugin: 'war'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    providedCompile project(':apps:jetty')
+}
+
+war {
+    from 'src'
+    exclude 'WEB-INF/web.xml'
+    exclude 'LICENSE'
+    exclude 'src'
+    exclude 'susimail.properties'
+    webInf {
+        into 'classes'
+        from 'src/susimail.properties'
+    }
+    webXml = file('src/WEB-INF/web.xml')
+}

apps/systray/build.gradle

@@ -0,0 +1,12 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile files('java/lib/systray4j.jar')
+}