[GNUnet-SVN] r32615 - in gnunet-java/src/main/java/org/gnunet/statistics: . messages

[gnunet]

Author: dold
Date: 2014-03-11 02:27:01 +0100 (Tue, 11 Mar 2014)
New Revision: 32615

Added:
   gnunet-java/src/main/java/org/gnunet/statistics/messages/
   gnunet-java/src/main/java/org/gnunet/statistics/messages/GetMessage.java
   
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
   
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/messages/SetMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchMessage.java
   
gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
Removed:
   gnunet-java/src/main/java/org/gnunet/statistics/GetMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/GetResponseEndMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/GetResponseMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/SetMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/WatchMessage.java
   gnunet-java/src/main/java/org/gnunet/statistics/WatchResponseMessage.java
Log:
move statistics messages

Deleted: gnunet-java/src/main/java/org/gnunet/statistics/GetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/GetMessage.java     
2014-03-11 01:25:03 UTC (rev 32614)
+++ gnunet-java/src/main/java/org/gnunet/statistics/GetMessage.java     
2014-03-11 01:27:01 UTC (rev 32615)
@@ -1,43 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.statistics;
-
-import org.gnunet.construct.UnionCase;
-import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.GnunetMessage;
-
-/**
- * Client --> Service
- *
- */
address@hidden(169)
-public class GetMessage implements GnunetMessage.Body {
-    /**
-     * Subsystem of interest, empty string for all subsystems.
-     */
-    @ZeroTerminatedString
-    public String subsystemName;
-    /**
-     * Statistics value name of interest, empty string for all values.
-     */
-    @ZeroTerminatedString
-    public String statisticsName;
-}

Deleted: 
gnunet-java/src/main/java/org/gnunet/statistics/GetResponseEndMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/GetResponseEndMessage.java  
2014-03-11 01:25:03 UTC (rev 32614)
+++ gnunet-java/src/main/java/org/gnunet/statistics/GetResponseEndMessage.java  
2014-03-11 01:27:01 UTC (rev 32615)
@@ -1,32 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.statistics;
-
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-/**
- * ...
-*/
address@hidden(171)
-public class GetResponseEndMessage implements GnunetMessage.Body {
-    // empty
-}

Deleted: gnunet-java/src/main/java/org/gnunet/statistics/GetResponseMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/GetResponseMessage.java     
2014-03-11 01:25:03 UTC (rev 32614)
+++ gnunet-java/src/main/java/org/gnunet/statistics/GetResponseMessage.java     
2014-03-11 01:27:01 UTC (rev 32615)
@@ -1,49 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.statistics;
-
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UInt64;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.GnunetMessage;
-
-/**
- * service --> client
- *
- *
- */
address@hidden(170)
-public class GetResponseMessage implements GnunetMessage.Body {
-    /**
-     * Unique numerical identifier for the value (will
-     * not change during the same client-session).  Highest
-     * bit will be set for persistent values.
-     */
-    @UInt32
-    public long uid;
-    @UInt64
-    public long value;
-    @ZeroTerminatedString
-    public String subsystemName;
-    @ZeroTerminatedString
-    public String statisticName;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/statistics/SetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/SetMessage.java     
2014-03-11 01:25:03 UTC (rev 32614)
+++ gnunet-java/src/main/java/org/gnunet/statistics/SetMessage.java     
2014-03-11 01:27:01 UTC (rev 32615)
@@ -1,43 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.statistics;
-
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UInt64;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.GnunetMessage;
-
-
-/**
- * Sent to the service by the client to set a statistics value.
- */
address@hidden(168)
-public class SetMessage implements GnunetMessage.Body {
-    @UInt32
-    public int flags;
-    @UInt64
-    public long value;
-    @ZeroTerminatedString
-    public String subsystemName;
-    @ZeroTerminatedString
-    public String statisticName;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/statistics/WatchMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/WatchMessage.java   
2014-03-11 01:25:03 UTC (rev 32614)
+++ gnunet-java/src/main/java/org/gnunet/statistics/WatchMessage.java   
2014-03-11 01:27:01 UTC (rev 32615)
@@ -1,40 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.statistics;
-
-
-import org.gnunet.construct.UnionCase;
-import org.gnunet.construct.ZeroTerminatedString;
-import org.gnunet.util.GnunetMessage;
-
address@hidden(172)
-public class WatchMessage implements GnunetMessage.Body {
-    /**
-     * Subsystem of interest, may not be empty.
-     */
-    @ZeroTerminatedString
-    public String subsystemName;
-    /**
-     * Statistics value name of interest, may not be empty.
-     */
-    @ZeroTerminatedString
-    public String statisticsName;
-}

Deleted: 
gnunet-java/src/main/java/org/gnunet/statistics/WatchResponseMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/WatchResponseMessage.java   
2014-03-11 01:25:03 UTC (rev 32614)
+++ gnunet-java/src/main/java/org/gnunet/statistics/WatchResponseMessage.java   
2014-03-11 01:27:01 UTC (rev 32615)
@@ -1,39 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.statistics;
-
-
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UInt64;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
address@hidden(173)
-public class WatchResponseMessage implements GnunetMessage.Body {
-    @UInt32
-    public int flags;
-    @UInt32
-    public int wid;
-    @UInt32
-    public int reserved ;
-    @UInt64
-    public long value;
-}

Added: gnunet-java/src/main/java/org/gnunet/statistics/messages/GetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/messages/GetMessage.java    
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/statistics/messages/GetMessage.java    
2014-03-11 01:27:01 UTC (rev 32615)
@@ -0,0 +1,43 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Client --> Service
+ *
+ */
address@hidden(169)
+public class GetMessage implements GnunetMessage.Body {
+    /**
+     * Subsystem of interest, empty string for all subsystems.
+     */
+    @ZeroTerminatedString
+    public String subsystemName;
+    /**
+     * Statistics value name of interest, empty string for all values.
+     */
+    @ZeroTerminatedString
+    public String statisticsName;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
                         (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseEndMessage.java
 2014-03-11 01:27:01 UTC (rev 32615)
@@ -0,0 +1,32 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * ...
+*/
address@hidden(171)
+public class GetResponseEndMessage implements GnunetMessage.Body {
+    // empty
+}

Added: 
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
                            (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/statistics/messages/GetResponseMessage.java
    2014-03-11 01:27:01 UTC (rev 32615)
@@ -0,0 +1,49 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics.messages;
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * service --> client
+ *
+ *
+ */
address@hidden(170)
+public class GetResponseMessage implements GnunetMessage.Body {
+    /**
+     * Unique numerical identifier for the value (will
+     * not change during the same client-session).  Highest
+     * bit will be set for persistent values.
+     */
+    @UInt32
+    public long uid;
+    @UInt64
+    public long value;
+    @ZeroTerminatedString
+    public String subsystemName;
+    @ZeroTerminatedString
+    public String statisticName;
+}

Added: gnunet-java/src/main/java/org/gnunet/statistics/messages/SetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/messages/SetMessage.java    
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/statistics/messages/SetMessage.java    
2014-03-11 01:27:01 UTC (rev 32615)
@@ -0,0 +1,45 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics.messages;
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+
+/**
+ * Sent to the service by the client to set a statistics value.
+ */
address@hidden(168)
+public class SetMessage implements GnunetMessage.Body {
+    public final static int SETFLAG_RELATIVE = 1;
+    public final static int SETFLAG_PERSIST = 2;
+    @UInt32
+    public int flags;
+    @UInt64
+    public long value;
+    @ZeroTerminatedString
+    public String subsystemName;
+    @ZeroTerminatedString
+    public String statisticName;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchMessage.java  
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchMessage.java  
2014-03-11 01:27:01 UTC (rev 32615)
@@ -0,0 +1,40 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics.messages;
+
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
address@hidden(172)
+public class WatchMessage implements GnunetMessage.Body {
+    /**
+     * Subsystem of interest, may not be empty.
+     */
+    @ZeroTerminatedString
+    public String subsystemName;
+    /**
+     * Statistics value name of interest, may not be empty.
+     */
+    @ZeroTerminatedString
+    public String statisticsName;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
                          (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/statistics/messages/WatchResponseMessage.java
  2014-03-11 01:27:01 UTC (rev 32615)
@@ -0,0 +1,39 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics.messages;
+
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
address@hidden(173)
+public class WatchResponseMessage implements GnunetMessage.Body {
+    @UInt32
+    public int flags;
+    @UInt32
+    public int wid;
+    @UInt32
+    public int reserved ;
+    @UInt64
+    public long value;
+}