work in progress on core and server/service, changes/additions to construct

4 files changed, 3 insertions, 4 deletions

diff --git a/test/org/gnunet/construct/ByteFillMessage.java b/test/org/gnunet/construct/ByteFillMessage.java
index 55b0e89..77bfde1 100644
--- a/test/org/gnunet/construct/ByteFillMessage.java
+++ b/test/org/gnunet/construct/ByteFillMessage.java
@@ -2,7 +2,7 @@ package org.gnunet.construct;
 
 
 public class ByteFillMessage implements Message {
-    @Nested
+    @NestedMessage
     public MessageHeader header;
     
     @UInt32
diff --git a/test/org/gnunet/construct/QueryMessage.java b/test/org/gnunet/construct/QueryMessage.java
index df058da..245dd70 100644
--- a/test/org/gnunet/construct/QueryMessage.java
+++ b/test/org/gnunet/construct/QueryMessage.java
@@ -2,7 +2,7 @@ package org.gnunet.construct;
 
 public class QueryMessage implements Message {
 
-    @Nested
+    @NestedMessage
     public MessageHeader header;
 
     @UInt8
diff --git a/test/org/gnunet/construct/SimpleTestMessage.java b/test/org/gnunet/construct/SimpleTestMessage.java
index 27810f7..ae77ab7 100644
--- a/test/org/gnunet/construct/SimpleTestMessage.java
+++ b/test/org/gnunet/construct/SimpleTestMessage.java
@@ -8,7 +8,7 @@ public class SimpleTestMessage implements Message {
     @UInt8
     public short v2;
 
-    @Nested
+    @NestedMessage
     public SimpleTestMessage2 mn;
     
     @FixedSizeArray(length=5)
diff --git a/test/org/gnunet/construct/SizeTestMessage.java b/test/org/gnunet/construct/SizeTestMessage.java
index b4ef79e..b3a0c9b 100644
--- a/test/org/gnunet/construct/SizeTestMessage.java
+++ b/test/org/gnunet/construct/SizeTestMessage.java
@@ -1,6 +1,5 @@
 package org.gnunet.construct;
 
-@MessageId(987)
 public class SizeTestMessage implements Message {
 
     @FrameSize