[GNUnet-SVN] r23515 - in gnunet-java-ext: . bin config src/org/gnunet src/org/gnunet/construct src/org/gnunet/ext tools

[gnunet]

Author: dold
Date: 2012-08-30 01:30:23 +0200 (Thu, 30 Aug 2012)
New Revision: 23515

Added:
   gnunet-java-ext/bin/gnunet-greeting
   gnunet-java-ext/bin/gnunet-service-greeting
   gnunet-java-ext/config/
   gnunet-java-ext/config/greeting.conf
   gnunet-java-ext/src/org/gnunet/construct/
   gnunet-java-ext/src/org/gnunet/construct/MsgMap.txt
   gnunet-java-ext/src/org/gnunet/ext/GreetingBannedMessage.java
   gnunet-java-ext/src/org/gnunet/ext/GreetingClient.java
   gnunet-java-ext/src/org/gnunet/ext/GreetingRequestMessage.java
   gnunet-java-ext/src/org/gnunet/ext/GreetingResponseMessage.java
   gnunet-java-ext/src/org/gnunet/ext/GreetingService.java
   gnunet-java-ext/tools/update-msgtypes
Modified:
   gnunet-java-ext/bin/gnunet-ext
   gnunet-java-ext/envcfg
Log:
now works with the latest gnunet-java again, added example service and 
corresponding client


Modified: gnunet-java-ext/bin/gnunet-ext
===================================================================
--- gnunet-java-ext/bin/gnunet-ext      2012-08-29 23:28:12 UTC (rev 23514)
+++ gnunet-java-ext/bin/gnunet-ext      2012-08-29 23:30:23 UTC (rev 23515)
@@ -5,6 +5,7 @@
 BASEDIR=`dirname $0`/..
 
 source $BASEDIR/envcfg
+CP="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*"
 
-java -ea -cp 
"$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" 
org.gnunet.ext.MyExt "$@"
+java -ea -cp "$CP" org.gnunet.ext.MyExt "$@"
 

Added: gnunet-java-ext/bin/gnunet-greeting
===================================================================
--- gnunet-java-ext/bin/gnunet-greeting                         (rev 0)
+++ gnunet-java-ext/bin/gnunet-greeting 2012-08-29 23:30:23 UTC (rev 23515)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Template for a gnunet-java extension. Modify to fit your needs.
+
+BASEDIR=`dirname $0`/..
+
+source $BASEDIR/envcfg
+
+java -ea -cp 
"$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" 
org.gnunet.ext.GreetingClient "$@"
+


Property changes on: gnunet-java-ext/bin/gnunet-greeting
___________________________________________________________________
Added: svn:executable
   + *

Added: gnunet-java-ext/bin/gnunet-service-greeting
===================================================================
--- gnunet-java-ext/bin/gnunet-service-greeting                         (rev 0)
+++ gnunet-java-ext/bin/gnunet-service-greeting 2012-08-29 23:30:23 UTC (rev 
23515)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Template for a gnunet-java extension. Modify to fit your needs.
+
+BASEDIR=`dirname $0`/..
+
+source $BASEDIR/envcfg
+
+java -ea -cp 
"$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" 
org.gnunet.ext.GreetingService "$@"
+


Property changes on: gnunet-java-ext/bin/gnunet-service-greeting
___________________________________________________________________
Added: svn:executable
   + *

Added: gnunet-java-ext/config/greeting.conf
===================================================================
--- gnunet-java-ext/config/greeting.conf                                (rev 0)
+++ gnunet-java-ext/config/greeting.conf        2012-08-29 23:30:23 UTC (rev 
23515)
@@ -0,0 +1,12 @@
+[greeting]
+PORT = 3001
+HOSTNAME = localhost
+ACCEPT_FROM = 127.0.0.1
+# names that the greeting service won't greet!
+BANNED = "dold;Florian Dold"
+# message for banned entities
+BAN_MESSAGE = "%s, you are not welcome here!"
+BINARY = gnunet-service-greeting
+CONFIG = $DEFAULTCONFIG
+PIPECONTROL = YES
+OPTIONS = -LDEBUG

Modified: gnunet-java-ext/envcfg
===================================================================
--- gnunet-java-ext/envcfg      2012-08-29 23:28:12 UTC (rev 23514)
+++ gnunet-java-ext/envcfg      2012-08-29 23:30:23 UTC (rev 23515)
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # location the the gnunet-java-jar
-GNUNET_JAVA_CLASSPATH=      # e.g. 
/home/<your-name>/gnunet-java/gnunet-java.jar
+#GNUNET_JAVA_CLASSPATH=      # e.g. 
/home/<your-name>/gnunet-java/gnunet-java.jar
+GNUNET_JAVA_CLASSPATH="/home/dold/svn/gnunet-java/gnunet-java.jar"
 
 # location of gnunet-java's lib directory
-GNUNET_JAVA_DEPS=      # e.g. /home/<your-name>/gnunet-java/lib/
+#GNUNET_JAVA_DEPS=      # e.g. /home/<your-name>/gnunet-java/lib/
+GNUNET_JAVA_DEPS="/home/dold/svn/gnunet-java/lib/"

Added: gnunet-java-ext/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java-ext/src/org/gnunet/construct/MsgMap.txt                         
(rev 0)
+++ gnunet-java-ext/src/org/gnunet/construct/MsgMap.txt 2012-08-29 23:30:23 UTC 
(rev 23515)
@@ -0,0 +1,4 @@
+org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage
+org.gnunet.util.GnunetMessage$Body|42002=org.gnunet.ext.GreetingResponseMessage
+org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.ext.GreetingRequestMessage
+# generated 2012/08/29 02:16:37

Added: gnunet-java-ext/src/org/gnunet/ext/GreetingBannedMessage.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingBannedMessage.java               
                (rev 0)
+++ gnunet-java-ext/src/org/gnunet/ext/GreetingBannedMessage.java       
2012-08-29 23:30:23 UTC (rev 23515)
@@ -0,0 +1,16 @@
+package org.gnunet.ext;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Message sent by the server when the requested name for the greeting is 
banned.
+ *
+ * @author Florian Dold
+ */
address@hidden(42003)
+public class GreetingBannedMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String banText;
+}

Added: gnunet-java-ext/src/org/gnunet/ext/GreetingClient.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingClient.java                      
        (rev 0)
+++ gnunet-java-ext/src/org/gnunet/ext/GreetingClient.java      2012-08-29 
23:30:23 UTC (rev 23515)
@@ -0,0 +1,59 @@
+package org.gnunet.ext;
+
+import org.gnunet.util.*;
+import org.gnunet.util.getopt.Argument;
+import org.gnunet.util.getopt.ArgumentAction;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class GreetingClient {
+    public static void main(String[] args) {
+        new Program(args) {
+            @Argument(
+                    action = ArgumentAction.STORE_STRING,
+                    argumentName = "name",
+                    description = "name to greet",
+                    shortname = "n",
+                    longname = "name")
+            String name;
+
+            public void run() {
+                if (name == null) {
+                    System.out.println("no name given");
+                    System.exit(2);
+                }
+                final Client client = new Client("greeting", 
getConfiguration());
+                GreetingRequestMessage m = new GreetingRequestMessage();
+                m.name = name;
+                client.transmitWhenReady(RelativeTime.SECOND, m, new 
Continuation() {
+                    @Override
+                    public void cont(boolean success) {
+                        if (success) {
+                            client.receive(RelativeTime.SECOND, new 
RunaboutMessageReceiver() {
+                                public void visit(GreetingResponseMessage m) {
+                                    System.out.println("you were greeted:");
+                                    System.out.println(m.greeting);
+                                }
+                                public void visit(GreetingBannedMessage m) {
+                                    System.out.println("you are banned:");
+                                    System.out.println(m.banText);
+                                }
+                                @Override
+                                public void handleError() {
+                                    System.out.println("could not receive from 
service");
+                                    System.exit(1);
+                                }
+                            });
+                        } else {
+                            System.out.println("could not send to service");
+                            System.exit(1);
+                        }
+                    }
+                });
+            }
+        }.start();
+    }
+}

Added: gnunet-java-ext/src/org/gnunet/ext/GreetingRequestMessage.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingRequestMessage.java              
                (rev 0)
+++ gnunet-java-ext/src/org/gnunet/ext/GreetingRequestMessage.java      
2012-08-29 23:30:23 UTC (rev 23515)
@@ -0,0 +1,17 @@
+package org.gnunet.ext;
+
+import org.gnunet.construct.Union;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Message to request a greeting from the greeting server.
+ *
+ * @author Florian Dold
+ */
address@hidden(42001)
+public class GreetingRequestMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String name;
+}

Added: gnunet-java-ext/src/org/gnunet/ext/GreetingResponseMessage.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingResponseMessage.java             
                (rev 0)
+++ gnunet-java-ext/src/org/gnunet/ext/GreetingResponseMessage.java     
2012-08-29 23:30:23 UTC (rev 23515)
@@ -0,0 +1,16 @@
+package org.gnunet.ext;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Response to a greeting request from a client, sent by the server if name is 
not banned.
+ *
+ * @author Florian Dold
+ */
address@hidden(42002)
+public class GreetingResponseMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String greeting;
+}

Added: gnunet-java-ext/src/org/gnunet/ext/GreetingService.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingService.java                     
        (rev 0)
+++ gnunet-java-ext/src/org/gnunet/ext/GreetingService.java     2012-08-29 
23:30:23 UTC (rev 23515)
@@ -0,0 +1,58 @@
+package org.gnunet.ext;
+
+import org.gnunet.util.RelativeTime;
+import org.gnunet.util.Server;
+import org.gnunet.util.Service;
+import org.gnunet.util.getopt.Argument;
+import org.gnunet.util.getopt.ArgumentAction;
+
+import javax.swing.*;
+import java.util.*;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class GreetingService {
+
+    public static void main(String... argv) {
+        new Service("greeting", RelativeTime.FOREVER, true, argv) {
+            @Argument(
+                action = ArgumentAction.STORE_STRING,
+                argumentName = "GREETING_TEMPLATE",
+                description = "Template for the greeting, '%s' is substituted 
for the name!",
+                shortname = "g",
+                longname = "greeting")
+            String greetingTemplate = "Hello, %s";
+
+            @Override
+            public void run() {
+                final String bannedStr = 
getConfiguration().getValueString("greeting", "BANNED");
+                final String banMessage = 
getConfiguration().getValueString("greeting", "BAN_MESSAGE");
+                final List<String> banned;
+                if (bannedStr != null) {
+                    banned = Arrays.asList(bannedStr.split(";"));
+                } else {
+                    banned = Collections.emptyList();
+                }
+
+                getServer().setHandler(new Server.MessageRunabout() {
+                    public void visit(GreetingRequestMessage rm) {
+                        if (banned.contains(rm.name.trim())) {
+                            GreetingBannedMessage m = new 
GreetingBannedMessage();
+                            m.banText = banMessage == null ? "" : 
banMessage.replace("%s", rm.name);
+                            
getSender().transmitWhenReady(RelativeTime.FOREVER, m, null);
+                        } else {
+                            GreetingResponseMessage m = new 
GreetingResponseMessage();
+                            m.greeting = greetingTemplate.replace("%s", 
rm.name);
+                            
getSender().transmitWhenReady(RelativeTime.FOREVER, m, null);
+                        }
+                    }
+                });
+
+            }
+        }.start();
+
+    }
+}

Added: gnunet-java-ext/tools/update-msgtypes
===================================================================
--- gnunet-java-ext/tools/update-msgtypes                               (rev 0)
+++ gnunet-java-ext/tools/update-msgtypes       2012-08-29 23:30:23 UTC (rev 
23515)
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+SOURCES=$( mktemp "/tmp/gnunet-java-sources-XXX" )
+
+source $BASEDIR/envcfg
+
+CP="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*"
+
+# collect all source files
+find $BASEDIR/src/ $BASEDIR/test/ -name "*.java" > $SOURCES
+
+# run annotation processor
+javac -cp $CP -processor org.gnunet.construct.MessageIdAnnotationProcessor 
-proc:only -s src @$SOURCES
+
+if [ $? ] ; then
+    rm $SOURCES
+else
+    exit 1
+fi


Property changes on: gnunet-java-ext/tools/update-msgtypes
___________________________________________________________________
Added: svn:executable
   + *