- use standard gradle source tree layout

- adapt to API changes
- adapt wrapper
- use ivy repo for dependencies

11 files changed, 27 insertions, 46 deletions

diff --git a/bin/gnunet-ext b/bin/gnunet-ext
index f63f077..6b1d69b 100755
--- a/bin/gnunet-ext
+++ b/bin/gnunet-ext
@@ -2,9 +2,8 @@
 
 # Template for a gnunet-java extension. Modify to fit your needs.
 
-BASEDIR=`dirname $0`/..
+DIR=`dirname $0`
+export CLASSPATH="$DIR/../build-gradle/classes/main/:$DIR/../build-gradle/resources/main/:$DIR/../lib/*"
 
-CP="$BASEDIR/build-gradle/libs/*:$GNJ_HOME/*:$GNJ_DEPS/*"
-
-java -ea -cp "$CP" org.gnunet.ext.MyExt "$@"
+java -ea org.gnunet.ext.MyExt "$@"
 
diff --git a/bin/gnunet-greeting b/bin/gnunet-greeting
index 087cc76..335359e 100755
--- a/bin/gnunet-greeting
+++ b/bin/gnunet-greeting
@@ -2,9 +2,8 @@
 
 # Template for a gnunet-java extension. Modify to fit your needs.
 
-BASEDIR=`dirname $0`/..
+DIR=`dirname $0`
+export CLASSPATH="$DIR/../build-gradle/classes/main/:$DIR/../build-gradle/resources/main/:$DIR/../lib/*"
 
-CP="$BASEDIR/build-gradle/libs/*:$GNJ_HOME/*:$GNJ_DEPS/*"
-
-java -ea -cp $CP org.gnunet.ext.GreetingClient "$@"
+java -ea org.gnunet.ext.GreetingClient "$@"
 
diff --git a/bin/gnunet-service-greeting b/bin/gnunet-service-greeting
index e9c7c1e..aa110a6 100755
--- a/bin/gnunet-service-greeting
+++ b/bin/gnunet-service-greeting
@@ -2,9 +2,9 @@
 
 # Template for a gnunet-java extension. Modify to fit your needs.
 
-BASEDIR=`dirname $0`/..
+DIR=`dirname $0`
+# if we are in the development environment use class files directly instead of jar
+export CLASSPATH="$DIR/../build-gradle/classes/main/:$DIR/../build-gradle/resources/main/:$DIR/../lib/*"
 
-CP="$BASEDIR/build-gradle/libs/*:$GNJ_HOME/*:$GNJ_DEPS/*"
-
-java -ea -cp "$CP" org.gnunet.ext.GreetingService "$@"
+java -ea org.gnunet.ext.GreetingService "$@"
 
diff --git a/build.gradle b/build.gradle
index 96e968b..6084ff5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,42 +6,21 @@ apply plugin: 'java'
 
 buildDir = "$projectDir/build-gradle"
 
-if (null == System.getenv('GNJ_HOME')) {
-  throw new InvalidUserDataException('environment variable GNJ_HOME not set')
-}
-
-if (null == System.getenv('GNJ_DEPS')) {
-  throw new InvalidUserDataException('environment variable GNJ_DEPS not set')
+if (null != System.getenv('GNUNET_JAVA_IVY')) {
+  repositories {
+    ivy {
+      url System.getenv('GNUNET_JAVA_IVY')
+    }
+  }
 }
 
 repositories {
-  flatDir {
-    dirs "$System.env.GNJ_HOME", "$System.env.GNJ_DEPS"
-  }
+  mavenCentral()
 }
 
 dependencies {
-  compile name: 'gnunet-java'
-  compile name: 'guava', version: '14.0.1'
-}
-
-sourceSets {
-  main {
-    java {
-      srcDir 'src'
-    }
-    resources {
-      srcDir 'src'
-    }
-  }
-  test {
-    java {
-      srcDir 'test'
-    }
-    resources {
-      srcDir 'test'
-    }
-  }
+  compile group: 'org.gnunet', name: 'gnunet-java', version: '0.2'
+  compile group: 'com.google.guava', name: 'guava', version: '16.0.1'
 }
 
 compileJava.options.debugOptions.debugLevel = "source,lines,vars"
@@ -59,3 +38,7 @@ task msgtypes (type: JavaCompile) {
   destinationDir = file("$buildDir/classes/main/")
 }
 
+task copyDeps(type: Copy) {
+  into "$projectDir/lib"
+  from configurations.runtime
+}
diff --git a/src/org/gnunet/construct/MsgMap.txt b/src/main/java/org/gnunet/construct/MsgMap.txt
index 0a8e7dc..0a8e7dc 100644
--- a/src/org/gnunet/construct/MsgMap.txt
+++ b/src/main/java/org/gnunet/construct/MsgMap.txt
diff --git a/src/org/gnunet/ext/GreetingBannedMessage.java b/src/main/java/org/gnunet/ext/GreetingBannedMessage.java
index 06a5289..06a5289 100644
--- a/src/org/gnunet/ext/GreetingBannedMessage.java
+++ b/src/main/java/org/gnunet/ext/GreetingBannedMessage.java
diff --git a/src/org/gnunet/ext/GreetingClient.java b/src/main/java/org/gnunet/ext/GreetingClient.java
index 987b07d..72b7680 100644
--- a/src/org/gnunet/ext/GreetingClient.java
+++ b/src/main/java/org/gnunet/ext/GreetingClient.java
@@ -11,7 +11,7 @@ import org.gnunet.util.getopt.ArgumentAction;
  */
 public class GreetingClient {
     public static void main(String[] args) {
-        new Program(args) {
+        new Program() {
             @Argument(
                     action = ArgumentAction.STORE_STRING,
                     argumentName = "name",
@@ -54,6 +54,6 @@ public class GreetingClient {
                     }
                 });
             }
-        }.start();
+        }.start(args);
     }
 }
diff --git a/src/org/gnunet/ext/GreetingRequestMessage.java b/src/main/java/org/gnunet/ext/GreetingRequestMessage.java
index eac18d5..eac18d5 100644
--- a/src/org/gnunet/ext/GreetingRequestMessage.java
+++ b/src/main/java/org/gnunet/ext/GreetingRequestMessage.java
diff --git a/src/org/gnunet/ext/GreetingResponseMessage.java b/src/main/java/org/gnunet/ext/GreetingResponseMessage.java
index 89c463d..89c463d 100644
--- a/src/org/gnunet/ext/GreetingResponseMessage.java
+++ b/src/main/java/org/gnunet/ext/GreetingResponseMessage.java
diff --git a/src/org/gnunet/ext/GreetingService.java b/src/main/java/org/gnunet/ext/GreetingService.java
index 20f8fc1..20f8fc1 100644
--- a/src/org/gnunet/ext/GreetingService.java
+++ b/src/main/java/org/gnunet/ext/GreetingService.java
diff --git a/src/org/gnunet/ext/MyExt.java b/src/main/java/org/gnunet/ext/MyExt.java
index cae90c4..7d23a5c 100644
--- a/src/org/gnunet/ext/MyExt.java
+++ b/src/main/java/org/gnunet/ext/MyExt.java
@@ -4,10 +4,10 @@ import org.gnunet.util.*;
 
 public class MyExt {
     public static void main(String[] args) {
-            new Program(args) {
+            new Program() {
                 public void run() {
                     System.out.println("hi");
                 }
-            }.start();
+            }.start(args);
     }
 }