[GNUnet-SVN] r32618 - in gnunet-java-ext: . bin src src/main src/main/java src/main/java/org/gnunet/ext

[gnunet]

Author: dold
Date: 2014-03-11 02:49:35 +0100 (Tue, 11 Mar 2014)
New Revision: 32618

Added:
   gnunet-java-ext/src/main/
   gnunet-java-ext/src/main/java/
   gnunet-java-ext/src/main/java/org/
   gnunet-java-ext/src/test/
Removed:
   gnunet-java-ext/src/org/
   gnunet-java-ext/test/
Modified:
   gnunet-java-ext/bin/gnunet-ext
   gnunet-java-ext/bin/gnunet-greeting
   gnunet-java-ext/bin/gnunet-service-greeting
   gnunet-java-ext/build.gradle
   gnunet-java-ext/src/main/java/org/gnunet/ext/GreetingClient.java
   gnunet-java-ext/src/main/java/org/gnunet/ext/MyExt.java
Log:
- use standard gradle source tree layout
- adapt to API changes
- adapt wrapper
- use ivy repo for dependencies


Modified: gnunet-java-ext/bin/gnunet-ext
===================================================================
--- gnunet-java-ext/bin/gnunet-ext      2014-03-11 01:32:52 UTC (rev 32617)
+++ gnunet-java-ext/bin/gnunet-ext      2014-03-11 01:49:35 UTC (rev 32618)
@@ -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 org.gnunet.ext.MyExt "$@"
 
-java -ea -cp "$CP" org.gnunet.ext.MyExt "$@"
-

Modified: gnunet-java-ext/bin/gnunet-greeting
===================================================================
--- gnunet-java-ext/bin/gnunet-greeting 2014-03-11 01:32:52 UTC (rev 32617)
+++ gnunet-java-ext/bin/gnunet-greeting 2014-03-11 01:49:35 UTC (rev 32618)
@@ -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 org.gnunet.ext.GreetingClient "$@"
 
-java -ea -cp $CP org.gnunet.ext.GreetingClient "$@"
-

Modified: gnunet-java-ext/bin/gnunet-service-greeting
===================================================================
--- gnunet-java-ext/bin/gnunet-service-greeting 2014-03-11 01:32:52 UTC (rev 
32617)
+++ gnunet-java-ext/bin/gnunet-service-greeting 2014-03-11 01:49:35 UTC (rev 
32618)
@@ -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 org.gnunet.ext.GreetingService "$@"
 
-java -ea -cp "$CP" org.gnunet.ext.GreetingService "$@"
-

Modified: gnunet-java-ext/build.gradle
===================================================================
--- gnunet-java-ext/build.gradle        2014-03-11 01:32:52 UTC (rev 32617)
+++ gnunet-java-ext/build.gradle        2014-03-11 01:49:35 UTC (rev 32618)
@@ -6,44 +6,23 @@
 
 buildDir = "$projectDir/build-gradle"
 
-if (null == System.getenv('GNJ_HOME')) {
-  throw new InvalidUserDataException('environment variable GNJ_HOME not set')
+if (null != System.getenv('GNUNET_JAVA_IVY')) {
+  repositories {
+    ivy {
+      url System.getenv('GNUNET_JAVA_IVY')
+    }
+  }
 }
 
-if (null == System.getenv('GNJ_DEPS')) {
-  throw new InvalidUserDataException('environment variable GNJ_DEPS not set')
-}
-
 repositories {
-  flatDir {
-    dirs "$System.env.GNJ_HOME", "$System.env.GNJ_DEPS"
-  }
+  mavenCentral()
 }
 
 dependencies {
-  compile name: 'gnunet-java'
-  compile name: 'guava', version: '14.0.1'
+  compile group: 'org.gnunet', name: 'gnunet-java', version: '0.2'
+  compile group: 'com.google.guava', name: 'guava', version: '16.0.1'
 }
 
-sourceSets {
-  main {
-    java {
-      srcDir 'src'
-    }
-    resources {
-      srcDir 'src'
-    }
-  }
-  test {
-    java {
-      srcDir 'test'
-    }
-    resources {
-      srcDir 'test'
-    }
-  }
-}
-
 compileJava.options.debugOptions.debugLevel = "source,lines,vars"
 
 /*
@@ -59,3 +38,7 @@
   destinationDir = file("$buildDir/classes/main/")
 }
 
+task copyDeps(type: Copy) {
+  into "$projectDir/lib"
+  from configurations.runtime
+}

Modified: gnunet-java-ext/src/main/java/org/gnunet/ext/GreetingClient.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingClient.java      2014-03-11 
01:32:52 UTC (rev 32617)
+++ gnunet-java-ext/src/main/java/org/gnunet/ext/GreetingClient.java    
2014-03-11 01:49:35 UTC (rev 32618)
@@ -11,7 +11,7 @@
  */
 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 @@
                     }
                 });
             }
-        }.start();
+        }.start(args);
     }
 }

Modified: gnunet-java-ext/src/main/java/org/gnunet/ext/MyExt.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/MyExt.java       2014-03-11 01:32:52 UTC 
(rev 32617)
+++ gnunet-java-ext/src/main/java/org/gnunet/ext/MyExt.java     2014-03-11 
01:49:35 UTC (rev 32618)
@@ -4,10 +4,10 @@
 
 public class MyExt {
     public static void main(String[] args) {
-            new Program(args) {
+            new Program() {
                 public void run() {
                     System.out.println("hi");
                 }
-            }.start();
+            }.start(args);
     }
 }