Move Avro generated classes to gen subpackage
authorChristos KK Loverdos <loverdos@gmail.com>
Thu, 30 Aug 2012 09:25:52 +0000 (12:25 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Thu, 30 Aug 2012 09:25:52 +0000 (12:25 +0300)
20 files changed:
src/main/avro/aquarium-conf.avdl
src/main/avro/aquarium-events.avdl
src/main/java/gr/grnet/aquarium/message/avro/AquariumConf.java [deleted file]
src/main/java/gr/grnet/aquarium/message/avro/AquariumEvents.java [deleted file]
src/main/java/gr/grnet/aquarium/message/avro/gen/AquariumConf.java [new file with mode: 0644]
src/main/java/gr/grnet/aquarium/message/avro/gen/AquariumEvents.java [new file with mode: 0644]
src/main/java/gr/grnet/aquarium/message/avro/gen/_AnyValue.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_AnyValue.java with 71% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_CronSpecTuple.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_CronSpecTuple.java with 75% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_EffectivePriceTable.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_EffectivePriceTable.java with 57% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_EffectiveUnitPrice.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_EffectiveUnitPrice.java with 64% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_EventVersion.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_EventVersion.java with 63% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_FullPriceTable.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_FullPriceTable.java with 57% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_IMEvent.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_IMEvent.java with 79% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_Policy.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_Policy.java with 70% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_ResourceEvent.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_ResourceEvent.java with 79% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_ResourceType.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_ResourceType.java with 78% similarity]
src/main/java/gr/grnet/aquarium/message/avro/gen/_SelectorValue.java [moved from src/main/java/gr/grnet/aquarium/message/avro/_SelectorValue.java with 66% similarity]
src/main/scala/gr/grnet/aquarium/message/avro/MessageFactory.scala
src/test/scala/gr/grnet/aquarium/message/avro/gen/PolicyTest.scala [moved from src/test/scala/gr/grnet/aquarium/message/avro/PolicyTest.scala with 64% similarity]
src/test/scala/gr/grnet/aquarium/message/avro/gen/ResourceEventTest.scala [moved from src/test/scala/gr/grnet/aquarium/message/avro/ResourceEventTest.scala with 98% similarity]

index e11bb93..ac4bac6 100644 (file)
@@ -33,7 +33,7 @@
  * or implied, of GRNET S.A.
  */
 
-@namespace("gr.grnet.aquarium.message.avro")
+@namespace("gr.grnet.aquarium.message.avro.gen")
 protocol AquariumConf {
   enum _EventVersion {
     VERSION_1_0
index 2f8613b..7a4e2a4 100644 (file)
@@ -33,7 +33,7 @@
  * or implied, of GRNET S.A.
  */
 
-@namespace("gr.grnet.aquarium.message.avro")
+@namespace("gr.grnet.aquarium.message.avro.gen")
 protocol AquariumEvents {
   record _AnyValue {
     union {
diff --git a/src/main/java/gr/grnet/aquarium/message/avro/AquariumConf.java b/src/main/java/gr/grnet/aquarium/message/avro/AquariumConf.java
deleted file mode 100644 (file)
index 685bb37..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Autogenerated by Avro
- * 
- * DO NOT EDIT DIRECTLY
- */
-package gr.grnet.aquarium.message.avro;
-
-@SuppressWarnings("all")
-public interface AquariumConf {
-  public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"AquariumConf\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"types\":[{\"type\":\"enum\",\"name\":\"_EventVersion\",\"symbols\":[\"VERSION_1_0\"]},{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]},{\"type\":\"record\",\"name\":\"_ResourceType\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"unit\",\"type\":\"string\"},{\"name\":\"chargingBehaviorClass\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[\"_CronSpecTuple\",\"null\"]}]},{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":\"_EffectiveUnitPrice\"}}]},{\"type\":\"record\",\"name\":\"_SelectorValue\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[\"_EffectivePriceTable\",{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]},{\"type\":\"record\",\"name\":\"_FullPriceTable\",\"fields\":[{\"name\":\"perResource\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"map\",\"values\":\"_SelectorValue\"}}}]},{\"type\":\"record\",\"name\":\"_Policy\",\"fields\":[{\"name\":\"ID\",\"type\":\"string\",\"aliases\":[\"id, _id, idInStore, inStoreID\"]},{\"name\":\"parentID\",\"type\":\"string\"},{\"name\":\"validFromMillis\",\"type\":\"long\"},{\"name\":\"validToMillis\",\"type\":\"long\"},{\"name\":\"resourceTypes\",\"type\":{\"type\":\"array\",\"items\":\"_ResourceType\"}},{\"name\":\"chargingBehaviors\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"roleMapping\",\"type\":{\"type\":\"map\",\"values\":\"_FullPriceTable\"}}]}],\"messages\":{}}");
-
-  @SuppressWarnings("all")
-  public interface Callback extends AquariumConf {
-    public static final org.apache.avro.Protocol PROTOCOL = gr.grnet.aquarium.message.avro.AquariumConf.PROTOCOL;
-  }
-}
\ No newline at end of file
diff --git a/src/main/java/gr/grnet/aquarium/message/avro/AquariumEvents.java b/src/main/java/gr/grnet/aquarium/message/avro/AquariumEvents.java
deleted file mode 100644 (file)
index f110e35..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Autogenerated by Avro
- * 
- * DO NOT EDIT DIRECTLY
- */
-package gr.grnet.aquarium.message.avro;
-
-@SuppressWarnings("all")
-public interface AquariumEvents {
-  public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"AquariumEvents\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"types\":[{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]},{\"type\":\"record\",\"name\":\"_ResourceEvent\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"resource\",\"type\":\"string\",\"aliases\":[\"resourceType\"]},{\"name\":\"instanceID\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":\"_AnyValue\"}}]},{\"type\":\"record\",\"name\":\"_IMEvent\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"isActive\",\"type\":\"boolean\"},{\"name\":\"role\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":\"_AnyValue\"}}]}],\"messages\":{}}");
-
-  @SuppressWarnings("all")
-  public interface Callback extends AquariumEvents {
-    public static final org.apache.avro.Protocol PROTOCOL = gr.grnet.aquarium.message.avro.AquariumEvents.PROTOCOL;
-  }
-}
\ No newline at end of file
diff --git a/src/main/java/gr/grnet/aquarium/message/avro/gen/AquariumConf.java b/src/main/java/gr/grnet/aquarium/message/avro/gen/AquariumConf.java
new file mode 100644 (file)
index 0000000..6e0f6a1
--- /dev/null
@@ -0,0 +1,16 @@
+/**
+ * Autogenerated by Avro
+ * 
+ * DO NOT EDIT DIRECTLY
+ */
+package gr.grnet.aquarium.message.avro.gen;
+
+@SuppressWarnings("all")
+public interface AquariumConf {
+  public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"AquariumConf\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"types\":[{\"type\":\"enum\",\"name\":\"_EventVersion\",\"symbols\":[\"VERSION_1_0\"]},{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]},{\"type\":\"record\",\"name\":\"_ResourceType\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"unit\",\"type\":\"string\"},{\"name\":\"chargingBehaviorClass\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[\"_CronSpecTuple\",\"null\"]}]},{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":\"_EffectiveUnitPrice\"}}]},{\"type\":\"record\",\"name\":\"_SelectorValue\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[\"_EffectivePriceTable\",{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]},{\"type\":\"record\",\"name\":\"_FullPriceTable\",\"fields\":[{\"name\":\"perResource\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"map\",\"values\":\"_SelectorValue\"}}}]},{\"type\":\"record\",\"name\":\"_Policy\",\"fields\":[{\"name\":\"ID\",\"type\":\"string\",\"aliases\":[\"id, _id, idInStore, inStoreID\"]},{\"name\":\"parentID\",\"type\":\"string\"},{\"name\":\"validFromMillis\",\"type\":\"long\"},{\"name\":\"validToMillis\",\"type\":\"long\"},{\"name\":\"resourceTypes\",\"type\":{\"type\":\"array\",\"items\":\"_ResourceType\"}},{\"name\":\"chargingBehaviors\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"roleMapping\",\"type\":{\"type\":\"map\",\"values\":\"_FullPriceTable\"}}]}],\"messages\":{}}");
+
+  @SuppressWarnings("all")
+  public interface Callback extends AquariumConf {
+    public static final org.apache.avro.Protocol PROTOCOL = gr.grnet.aquarium.message.avro.gen.AquariumConf.PROTOCOL;
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/gr/grnet/aquarium/message/avro/gen/AquariumEvents.java b/src/main/java/gr/grnet/aquarium/message/avro/gen/AquariumEvents.java
new file mode 100644 (file)
index 0000000..afdeaed
--- /dev/null
@@ -0,0 +1,16 @@
+/**
+ * Autogenerated by Avro
+ * 
+ * DO NOT EDIT DIRECTLY
+ */
+package gr.grnet.aquarium.message.avro.gen;
+
+@SuppressWarnings("all")
+public interface AquariumEvents {
+  public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"AquariumEvents\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"types\":[{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]},{\"type\":\"record\",\"name\":\"_ResourceEvent\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"resource\",\"type\":\"string\",\"aliases\":[\"resourceType\"]},{\"name\":\"instanceID\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":\"_AnyValue\"}}]},{\"type\":\"record\",\"name\":\"_IMEvent\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"isActive\",\"type\":\"boolean\"},{\"name\":\"role\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":\"_AnyValue\"}}]}],\"messages\":{}}");
+
+  @SuppressWarnings("all")
+  public interface Callback extends AquariumEvents {
+    public static final org.apache.avro.Protocol PROTOCOL = gr.grnet.aquarium.message.avro.gen.AquariumEvents.PROTOCOL;
+  }
+}
\ No newline at end of file
@@ -3,10 +3,10 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _AnyValue extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_AnyValue\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_AnyValue\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]}");
   @Deprecated public java.lang.Object anyValue;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
@@ -41,18 +41,18 @@ public class _AnyValue extends org.apache.avro.specific.SpecificRecordBase imple
   }
 
   /** Creates a new _AnyValue RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._AnyValue.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._AnyValue.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._AnyValue.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._AnyValue.Builder();
   }
   
   /** Creates a new _AnyValue RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._AnyValue.Builder newBuilder(gr.grnet.aquarium.message.avro._AnyValue.Builder other) {
-    return new gr.grnet.aquarium.message.avro._AnyValue.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._AnyValue.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._AnyValue.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._AnyValue.Builder(other);
   }
   
   /** Creates a new _AnyValue RecordBuilder by copying an existing _AnyValue instance */
-  public static gr.grnet.aquarium.message.avro._AnyValue.Builder newBuilder(gr.grnet.aquarium.message.avro._AnyValue other) {
-    return new gr.grnet.aquarium.message.avro._AnyValue.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._AnyValue.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._AnyValue other) {
+    return new gr.grnet.aquarium.message.avro.gen._AnyValue.Builder(other);
   }
   
   /**
@@ -65,17 +65,17 @@ public class _AnyValue extends org.apache.avro.specific.SpecificRecordBase imple
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._AnyValue.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._AnyValue.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._AnyValue.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._AnyValue.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _AnyValue instance */
-    private Builder(gr.grnet.aquarium.message.avro._AnyValue other) {
-            super(gr.grnet.aquarium.message.avro._AnyValue.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._AnyValue other) {
+            super(gr.grnet.aquarium.message.avro.gen._AnyValue.SCHEMA$);
       if (isValidValue(fields()[0], other.anyValue)) {
         this.anyValue = (java.lang.Object) data().deepCopy(fields()[0].schema(), other.anyValue);
         fieldSetFlags()[0] = true;
@@ -88,7 +88,7 @@ public class _AnyValue extends org.apache.avro.specific.SpecificRecordBase imple
     }
     
     /** Sets the value of the 'anyValue' field */
-    public gr.grnet.aquarium.message.avro._AnyValue.Builder setAnyValue(java.lang.Object value) {
+    public gr.grnet.aquarium.message.avro.gen._AnyValue.Builder setAnyValue(java.lang.Object value) {
       validate(fields()[0], value);
       this.anyValue = value;
       fieldSetFlags()[0] = true;
@@ -101,7 +101,7 @@ public class _AnyValue extends org.apache.avro.specific.SpecificRecordBase imple
     }
     
     /** Clears the value of the 'anyValue' field */
-    public gr.grnet.aquarium.message.avro._AnyValue.Builder clearAnyValue() {
+    public gr.grnet.aquarium.message.avro.gen._AnyValue.Builder clearAnyValue() {
       anyValue = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -3,10 +3,10 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]}");
   @Deprecated public java.lang.CharSequence a;
   @Deprecated public java.lang.CharSequence b;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
@@ -59,18 +59,18 @@ public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase
   }
 
   /** Creates a new _CronSpecTuple RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._CronSpecTuple.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._CronSpecTuple.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder();
   }
   
   /** Creates a new _CronSpecTuple RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._CronSpecTuple.Builder newBuilder(gr.grnet.aquarium.message.avro._CronSpecTuple.Builder other) {
-    return new gr.grnet.aquarium.message.avro._CronSpecTuple.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder(other);
   }
   
   /** Creates a new _CronSpecTuple RecordBuilder by copying an existing _CronSpecTuple instance */
-  public static gr.grnet.aquarium.message.avro._CronSpecTuple.Builder newBuilder(gr.grnet.aquarium.message.avro._CronSpecTuple other) {
-    return new gr.grnet.aquarium.message.avro._CronSpecTuple.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._CronSpecTuple other) {
+    return new gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder(other);
   }
   
   /**
@@ -84,17 +84,17 @@ public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._CronSpecTuple.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._CronSpecTuple.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._CronSpecTuple.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _CronSpecTuple instance */
-    private Builder(gr.grnet.aquarium.message.avro._CronSpecTuple other) {
-            super(gr.grnet.aquarium.message.avro._CronSpecTuple.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._CronSpecTuple other) {
+            super(gr.grnet.aquarium.message.avro.gen._CronSpecTuple.SCHEMA$);
       if (isValidValue(fields()[0], other.a)) {
         this.a = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.a);
         fieldSetFlags()[0] = true;
@@ -111,7 +111,7 @@ public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'a' field */
-    public gr.grnet.aquarium.message.avro._CronSpecTuple.Builder setA(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder setA(java.lang.CharSequence value) {
       validate(fields()[0], value);
       this.a = value;
       fieldSetFlags()[0] = true;
@@ -124,7 +124,7 @@ public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'a' field */
-    public gr.grnet.aquarium.message.avro._CronSpecTuple.Builder clearA() {
+    public gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder clearA() {
       a = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -136,7 +136,7 @@ public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'b' field */
-    public gr.grnet.aquarium.message.avro._CronSpecTuple.Builder setB(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder setB(java.lang.CharSequence value) {
       validate(fields()[1], value);
       this.b = value;
       fieldSetFlags()[1] = true;
@@ -149,7 +149,7 @@ public class _CronSpecTuple extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'b' field */
-    public gr.grnet.aquarium.message.avro._CronSpecTuple.Builder clearB() {
+    public gr.grnet.aquarium.message.avro.gen._CronSpecTuple.Builder clearB() {
       b = null;
       fieldSetFlags()[1] = false;
       return this;
@@ -3,11 +3,11 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]}");
-  @Deprecated public java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice> priceOverrides;
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]}");
+  @Deprecated public java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice> priceOverrides;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -20,7 +20,7 @@ public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecor
   @SuppressWarnings(value="unchecked")
   public void put(int field$, java.lang.Object value$) {
     switch (field$) {
-    case 0: priceOverrides = (java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice>)value$; break;
+    case 0: priceOverrides = (java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice>)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -28,7 +28,7 @@ public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecor
   /**
    * Gets the value of the 'priceOverrides' field.
    */
-  public java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice> getPriceOverrides() {
+  public java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice> getPriceOverrides() {
     return priceOverrides;
   }
 
@@ -36,23 +36,23 @@ public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecor
    * Sets the value of the 'priceOverrides' field.
    * @param value the value to set.
    */
-  public void setPriceOverrides(java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice> value) {
+  public void setPriceOverrides(java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice> value) {
     this.priceOverrides = value;
   }
 
   /** Creates a new _EffectivePriceTable RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder();
   }
   
   /** Creates a new _EffectivePriceTable RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder other) {
-    return new gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder(other);
   }
   
   /** Creates a new _EffectivePriceTable RecordBuilder by copying an existing _EffectivePriceTable instance */
-  public static gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro._EffectivePriceTable other) {
-    return new gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._EffectivePriceTable other) {
+    return new gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder(other);
   }
   
   /**
@@ -61,34 +61,34 @@ public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecor
   public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<_EffectivePriceTable>
     implements org.apache.avro.data.RecordBuilder<_EffectivePriceTable> {
 
-    private java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice> priceOverrides;
+    private java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice> priceOverrides;
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._EffectivePriceTable.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _EffectivePriceTable instance */
-    private Builder(gr.grnet.aquarium.message.avro._EffectivePriceTable other) {
-            super(gr.grnet.aquarium.message.avro._EffectivePriceTable.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._EffectivePriceTable other) {
+            super(gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.SCHEMA$);
       if (isValidValue(fields()[0], other.priceOverrides)) {
-        this.priceOverrides = (java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice>) data().deepCopy(fields()[0].schema(), other.priceOverrides);
+        this.priceOverrides = (java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice>) data().deepCopy(fields()[0].schema(), other.priceOverrides);
         fieldSetFlags()[0] = true;
       }
     }
 
     /** Gets the value of the 'priceOverrides' field */
-    public java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice> getPriceOverrides() {
+    public java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice> getPriceOverrides() {
       return priceOverrides;
     }
     
     /** Sets the value of the 'priceOverrides' field */
-    public gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder setPriceOverrides(java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice> value) {
+    public gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder setPriceOverrides(java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice> value) {
       validate(fields()[0], value);
       this.priceOverrides = value;
       fieldSetFlags()[0] = true;
@@ -101,7 +101,7 @@ public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecor
     }
     
     /** Clears the value of the 'priceOverrides' field */
-    public gr.grnet.aquarium.message.avro._EffectivePriceTable.Builder clearPriceOverrides() {
+    public gr.grnet.aquarium.message.avro.gen._EffectivePriceTable.Builder clearPriceOverrides() {
       priceOverrides = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -111,7 +111,7 @@ public class _EffectivePriceTable extends org.apache.avro.specific.SpecificRecor
     public _EffectivePriceTable build() {
       try {
         _EffectivePriceTable record = new _EffectivePriceTable();
-        record.priceOverrides = fieldSetFlags()[0] ? this.priceOverrides : (java.util.List<gr.grnet.aquarium.message.avro._EffectiveUnitPrice>) defaultValue(fields()[0]);
+        record.priceOverrides = fieldSetFlags()[0] ? this.priceOverrides : (java.util.List<gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice>) defaultValue(fields()[0]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -3,12 +3,12 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}");
   @Deprecated public double unitPrice;
-  @Deprecated public gr.grnet.aquarium.message.avro._CronSpecTuple when;
+  @Deprecated public gr.grnet.aquarium.message.avro.gen._CronSpecTuple when;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -23,7 +23,7 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
   public void put(int field$, java.lang.Object value$) {
     switch (field$) {
     case 0: unitPrice = (java.lang.Double)value$; break;
-    case 1: when = (gr.grnet.aquarium.message.avro._CronSpecTuple)value$; break;
+    case 1: when = (gr.grnet.aquarium.message.avro.gen._CronSpecTuple)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -46,7 +46,7 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
   /**
    * Gets the value of the 'when' field.
    */
-  public gr.grnet.aquarium.message.avro._CronSpecTuple getWhen() {
+  public gr.grnet.aquarium.message.avro.gen._CronSpecTuple getWhen() {
     return when;
   }
 
@@ -54,23 +54,23 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
    * Sets the value of the 'when' field.
    * @param value the value to set.
    */
-  public void setWhen(gr.grnet.aquarium.message.avro._CronSpecTuple value) {
+  public void setWhen(gr.grnet.aquarium.message.avro.gen._CronSpecTuple value) {
     this.when = value;
   }
 
   /** Creates a new _EffectiveUnitPrice RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder();
   }
   
   /** Creates a new _EffectiveUnitPrice RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder newBuilder(gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder other) {
-    return new gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder(other);
   }
   
   /** Creates a new _EffectiveUnitPrice RecordBuilder by copying an existing _EffectiveUnitPrice instance */
-  public static gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder newBuilder(gr.grnet.aquarium.message.avro._EffectiveUnitPrice other) {
-    return new gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice other) {
+    return new gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder(other);
   }
   
   /**
@@ -80,27 +80,27 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
     implements org.apache.avro.data.RecordBuilder<_EffectiveUnitPrice> {
 
     private double unitPrice;
-    private gr.grnet.aquarium.message.avro._CronSpecTuple when;
+    private gr.grnet.aquarium.message.avro.gen._CronSpecTuple when;
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._EffectiveUnitPrice.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _EffectiveUnitPrice instance */
-    private Builder(gr.grnet.aquarium.message.avro._EffectiveUnitPrice other) {
-            super(gr.grnet.aquarium.message.avro._EffectiveUnitPrice.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice other) {
+            super(gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.SCHEMA$);
       if (isValidValue(fields()[0], other.unitPrice)) {
         this.unitPrice = (java.lang.Double) data().deepCopy(fields()[0].schema(), other.unitPrice);
         fieldSetFlags()[0] = true;
       }
       if (isValidValue(fields()[1], other.when)) {
-        this.when = (gr.grnet.aquarium.message.avro._CronSpecTuple) data().deepCopy(fields()[1].schema(), other.when);
+        this.when = (gr.grnet.aquarium.message.avro.gen._CronSpecTuple) data().deepCopy(fields()[1].schema(), other.when);
         fieldSetFlags()[1] = true;
       }
     }
@@ -111,7 +111,7 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
     }
     
     /** Sets the value of the 'unitPrice' field */
-    public gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder setUnitPrice(double value) {
+    public gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder setUnitPrice(double value) {
       validate(fields()[0], value);
       this.unitPrice = value;
       fieldSetFlags()[0] = true;
@@ -124,18 +124,18 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
     }
     
     /** Clears the value of the 'unitPrice' field */
-    public gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder clearUnitPrice() {
+    public gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder clearUnitPrice() {
       fieldSetFlags()[0] = false;
       return this;
     }
 
     /** Gets the value of the 'when' field */
-    public gr.grnet.aquarium.message.avro._CronSpecTuple getWhen() {
+    public gr.grnet.aquarium.message.avro.gen._CronSpecTuple getWhen() {
       return when;
     }
     
     /** Sets the value of the 'when' field */
-    public gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder setWhen(gr.grnet.aquarium.message.avro._CronSpecTuple value) {
+    public gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder setWhen(gr.grnet.aquarium.message.avro.gen._CronSpecTuple value) {
       validate(fields()[1], value);
       this.when = value;
       fieldSetFlags()[1] = true;
@@ -148,7 +148,7 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
     }
     
     /** Clears the value of the 'when' field */
-    public gr.grnet.aquarium.message.avro._EffectiveUnitPrice.Builder clearWhen() {
+    public gr.grnet.aquarium.message.avro.gen._EffectiveUnitPrice.Builder clearWhen() {
       when = null;
       fieldSetFlags()[1] = false;
       return this;
@@ -159,7 +159,7 @@ public class _EffectiveUnitPrice extends org.apache.avro.specific.SpecificRecord
       try {
         _EffectiveUnitPrice record = new _EffectiveUnitPrice();
         record.unitPrice = fieldSetFlags()[0] ? this.unitPrice : (java.lang.Double) defaultValue(fields()[0]);
-        record.when = fieldSetFlags()[1] ? this.when : (gr.grnet.aquarium.message.avro._CronSpecTuple) defaultValue(fields()[1]);
+        record.when = fieldSetFlags()[1] ? this.when : (gr.grnet.aquarium.message.avro.gen._CronSpecTuple) defaultValue(fields()[1]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -3,9 +3,9 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public enum _EventVersion { 
   VERSION_1_0  ;
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"enum\",\"name\":\"_EventVersion\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"symbols\":[\"VERSION_1_0\"]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"enum\",\"name\":\"_EventVersion\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"symbols\":[\"VERSION_1_0\"]}");
 }
@@ -3,11 +3,11 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_FullPriceTable\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"perResource\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_SelectorValue\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]},{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]}}}}]}");
-  @Deprecated public java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>> perResource;
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_FullPriceTable\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"perResource\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_SelectorValue\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]},{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]}}}}]}");
+  @Deprecated public java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>> perResource;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -20,7 +20,7 @@ public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase
   @SuppressWarnings(value="unchecked")
   public void put(int field$, java.lang.Object value$) {
     switch (field$) {
-    case 0: perResource = (java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>>)value$; break;
+    case 0: perResource = (java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>>)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -28,7 +28,7 @@ public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase
   /**
    * Gets the value of the 'perResource' field.
    */
-  public java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>> getPerResource() {
+  public java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>> getPerResource() {
     return perResource;
   }
 
@@ -36,23 +36,23 @@ public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase
    * Sets the value of the 'perResource' field.
    * @param value the value to set.
    */
-  public void setPerResource(java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>> value) {
+  public void setPerResource(java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>> value) {
     this.perResource = value;
   }
 
   /** Creates a new _FullPriceTable RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._FullPriceTable.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._FullPriceTable.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder();
   }
   
   /** Creates a new _FullPriceTable RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._FullPriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro._FullPriceTable.Builder other) {
-    return new gr.grnet.aquarium.message.avro._FullPriceTable.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder(other);
   }
   
   /** Creates a new _FullPriceTable RecordBuilder by copying an existing _FullPriceTable instance */
-  public static gr.grnet.aquarium.message.avro._FullPriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro._FullPriceTable other) {
-    return new gr.grnet.aquarium.message.avro._FullPriceTable.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._FullPriceTable other) {
+    return new gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder(other);
   }
   
   /**
@@ -61,34 +61,34 @@ public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase
   public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<_FullPriceTable>
     implements org.apache.avro.data.RecordBuilder<_FullPriceTable> {
 
-    private java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>> perResource;
+    private java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>> perResource;
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._FullPriceTable.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._FullPriceTable.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._FullPriceTable.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _FullPriceTable instance */
-    private Builder(gr.grnet.aquarium.message.avro._FullPriceTable other) {
-            super(gr.grnet.aquarium.message.avro._FullPriceTable.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._FullPriceTable other) {
+            super(gr.grnet.aquarium.message.avro.gen._FullPriceTable.SCHEMA$);
       if (isValidValue(fields()[0], other.perResource)) {
-        this.perResource = (java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>>) data().deepCopy(fields()[0].schema(), other.perResource);
+        this.perResource = (java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>>) data().deepCopy(fields()[0].schema(), other.perResource);
         fieldSetFlags()[0] = true;
       }
     }
 
     /** Gets the value of the 'perResource' field */
-    public java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>> getPerResource() {
+    public java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>> getPerResource() {
       return perResource;
     }
     
     /** Sets the value of the 'perResource' field */
-    public gr.grnet.aquarium.message.avro._FullPriceTable.Builder setPerResource(java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>> value) {
+    public gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder setPerResource(java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>> value) {
       validate(fields()[0], value);
       this.perResource = value;
       fieldSetFlags()[0] = true;
@@ -101,7 +101,7 @@ public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'perResource' field */
-    public gr.grnet.aquarium.message.avro._FullPriceTable.Builder clearPerResource() {
+    public gr.grnet.aquarium.message.avro.gen._FullPriceTable.Builder clearPerResource() {
       perResource = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -111,7 +111,7 @@ public class _FullPriceTable extends org.apache.avro.specific.SpecificRecordBase
     public _FullPriceTable build() {
       try {
         _FullPriceTable record = new _FullPriceTable();
-        record.perResource = fieldSetFlags()[0] ? this.perResource : (java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._SelectorValue>>) defaultValue(fields()[0]);
+        record.perResource = fieldSetFlags()[0] ? this.perResource : (java.util.Map<java.lang.CharSequence,java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._SelectorValue>>) defaultValue(fields()[0]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -3,10 +3,10 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_IMEvent\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"isActive\",\"type\":\"boolean\"},{\"name\":\"role\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]}}}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_IMEvent\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"isActive\",\"type\":\"boolean\"},{\"name\":\"role\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]}}}]}");
   @Deprecated public java.lang.CharSequence id;
   @Deprecated public java.lang.CharSequence idInStore;
   @Deprecated public long occurredMillis;
@@ -16,7 +16,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
   @Deprecated public java.lang.CharSequence eventVersion;
   @Deprecated public boolean isActive;
   @Deprecated public java.lang.CharSequence role;
-  @Deprecated public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> details;
+  @Deprecated public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> details;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -47,7 +47,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     case 6: eventVersion = (java.lang.CharSequence)value$; break;
     case 7: isActive = (java.lang.Boolean)value$; break;
     case 8: role = (java.lang.CharSequence)value$; break;
-    case 9: details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue>)value$; break;
+    case 9: details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue>)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -190,7 +190,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
   /**
    * Gets the value of the 'details' field.
    */
-  public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> getDetails() {
+  public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> getDetails() {
     return details;
   }
 
@@ -198,23 +198,23 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
    * Sets the value of the 'details' field.
    * @param value the value to set.
    */
-  public void setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> value) {
+  public void setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> value) {
     this.details = value;
   }
 
   /** Creates a new _IMEvent RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._IMEvent.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._IMEvent.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._IMEvent.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._IMEvent.Builder();
   }
   
   /** Creates a new _IMEvent RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._IMEvent.Builder newBuilder(gr.grnet.aquarium.message.avro._IMEvent.Builder other) {
-    return new gr.grnet.aquarium.message.avro._IMEvent.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._IMEvent.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._IMEvent.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._IMEvent.Builder(other);
   }
   
   /** Creates a new _IMEvent RecordBuilder by copying an existing _IMEvent instance */
-  public static gr.grnet.aquarium.message.avro._IMEvent.Builder newBuilder(gr.grnet.aquarium.message.avro._IMEvent other) {
-    return new gr.grnet.aquarium.message.avro._IMEvent.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._IMEvent.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._IMEvent other) {
+    return new gr.grnet.aquarium.message.avro.gen._IMEvent.Builder(other);
   }
   
   /**
@@ -232,21 +232,21 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     private java.lang.CharSequence eventVersion;
     private boolean isActive;
     private java.lang.CharSequence role;
-    private java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> details;
+    private java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> details;
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._IMEvent.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._IMEvent.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._IMEvent.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._IMEvent.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _IMEvent instance */
-    private Builder(gr.grnet.aquarium.message.avro._IMEvent other) {
-            super(gr.grnet.aquarium.message.avro._IMEvent.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._IMEvent other) {
+            super(gr.grnet.aquarium.message.avro.gen._IMEvent.SCHEMA$);
       if (isValidValue(fields()[0], other.id)) {
         this.id = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.id);
         fieldSetFlags()[0] = true;
@@ -284,7 +284,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
         fieldSetFlags()[8] = true;
       }
       if (isValidValue(fields()[9], other.details)) {
-        this.details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue>) data().deepCopy(fields()[9].schema(), other.details);
+        this.details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue>) data().deepCopy(fields()[9].schema(), other.details);
         fieldSetFlags()[9] = true;
       }
     }
@@ -295,7 +295,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'id' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setId(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setId(java.lang.CharSequence value) {
       validate(fields()[0], value);
       this.id = value;
       fieldSetFlags()[0] = true;
@@ -308,7 +308,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'id' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearId() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearId() {
       id = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -320,7 +320,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'idInStore' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setIdInStore(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setIdInStore(java.lang.CharSequence value) {
       validate(fields()[1], value);
       this.idInStore = value;
       fieldSetFlags()[1] = true;
@@ -333,7 +333,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'idInStore' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearIdInStore() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearIdInStore() {
       idInStore = null;
       fieldSetFlags()[1] = false;
       return this;
@@ -345,7 +345,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'occurredMillis' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setOccurredMillis(long value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setOccurredMillis(long value) {
       validate(fields()[2], value);
       this.occurredMillis = value;
       fieldSetFlags()[2] = true;
@@ -358,7 +358,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'occurredMillis' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearOccurredMillis() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearOccurredMillis() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -369,7 +369,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'receivedMillis' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setReceivedMillis(long value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setReceivedMillis(long value) {
       validate(fields()[3], value);
       this.receivedMillis = value;
       fieldSetFlags()[3] = true;
@@ -382,7 +382,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'receivedMillis' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearReceivedMillis() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearReceivedMillis() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -393,7 +393,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'userID' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setUserID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setUserID(java.lang.CharSequence value) {
       validate(fields()[4], value);
       this.userID = value;
       fieldSetFlags()[4] = true;
@@ -406,7 +406,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'userID' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearUserID() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearUserID() {
       userID = null;
       fieldSetFlags()[4] = false;
       return this;
@@ -418,7 +418,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'clientID' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setClientID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setClientID(java.lang.CharSequence value) {
       validate(fields()[5], value);
       this.clientID = value;
       fieldSetFlags()[5] = true;
@@ -431,7 +431,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'clientID' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearClientID() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearClientID() {
       clientID = null;
       fieldSetFlags()[5] = false;
       return this;
@@ -443,7 +443,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'eventVersion' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setEventVersion(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setEventVersion(java.lang.CharSequence value) {
       validate(fields()[6], value);
       this.eventVersion = value;
       fieldSetFlags()[6] = true;
@@ -456,7 +456,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'eventVersion' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearEventVersion() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearEventVersion() {
       eventVersion = null;
       fieldSetFlags()[6] = false;
       return this;
@@ -468,7 +468,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'isActive' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setIsActive(boolean value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setIsActive(boolean value) {
       validate(fields()[7], value);
       this.isActive = value;
       fieldSetFlags()[7] = true;
@@ -481,7 +481,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'isActive' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearIsActive() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearIsActive() {
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -492,7 +492,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Sets the value of the 'role' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setRole(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setRole(java.lang.CharSequence value) {
       validate(fields()[8], value);
       this.role = value;
       fieldSetFlags()[8] = true;
@@ -505,19 +505,19 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'role' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearRole() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearRole() {
       role = null;
       fieldSetFlags()[8] = false;
       return this;
     }
 
     /** Gets the value of the 'details' field */
-    public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> getDetails() {
+    public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> getDetails() {
       return details;
     }
     
     /** Sets the value of the 'details' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> value) {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> value) {
       validate(fields()[9], value);
       this.details = value;
       fieldSetFlags()[9] = true;
@@ -530,7 +530,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
     }
     
     /** Clears the value of the 'details' field */
-    public gr.grnet.aquarium.message.avro._IMEvent.Builder clearDetails() {
+    public gr.grnet.aquarium.message.avro.gen._IMEvent.Builder clearDetails() {
       details = null;
       fieldSetFlags()[9] = false;
       return this;
@@ -549,7 +549,7 @@ public class _IMEvent extends org.apache.avro.specific.SpecificRecordBase implem
         record.eventVersion = fieldSetFlags()[6] ? this.eventVersion : (java.lang.CharSequence) defaultValue(fields()[6]);
         record.isActive = fieldSetFlags()[7] ? this.isActive : (java.lang.Boolean) defaultValue(fields()[7]);
         record.role = fieldSetFlags()[8] ? this.role : (java.lang.CharSequence) defaultValue(fields()[8]);
-        record.details = fieldSetFlags()[9] ? this.details : (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue>) defaultValue(fields()[9]);
+        record.details = fieldSetFlags()[9] ? this.details : (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue>) defaultValue(fields()[9]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -3,17 +3,17 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _Policy extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_Policy\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"ID\",\"type\":\"string\",\"aliases\":[\"id, _id, idInStore, inStoreID\"]},{\"name\":\"parentID\",\"type\":\"string\"},{\"name\":\"validFromMillis\",\"type\":\"long\"},{\"name\":\"validToMillis\",\"type\":\"long\"},{\"name\":\"resourceTypes\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_ResourceType\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"unit\",\"type\":\"string\"},{\"name\":\"chargingBehaviorClass\",\"type\":\"string\"}]}}},{\"name\":\"chargingBehaviors\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"roleMapping\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_FullPriceTable\",\"fields\":[{\"name\":\"perResource\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_SelectorValue\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]},{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]}}}}]}}}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_Policy\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"ID\",\"type\":\"string\",\"aliases\":[\"id, _id, idInStore, inStoreID\"]},{\"name\":\"parentID\",\"type\":\"string\"},{\"name\":\"validFromMillis\",\"type\":\"long\"},{\"name\":\"validToMillis\",\"type\":\"long\"},{\"name\":\"resourceTypes\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_ResourceType\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"unit\",\"type\":\"string\"},{\"name\":\"chargingBehaviorClass\",\"type\":\"string\"}]}}},{\"name\":\"chargingBehaviors\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"roleMapping\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_FullPriceTable\",\"fields\":[{\"name\":\"perResource\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_SelectorValue\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]},{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]}}}}]}}}]}");
   @Deprecated public java.lang.CharSequence ID;
   @Deprecated public java.lang.CharSequence parentID;
   @Deprecated public long validFromMillis;
   @Deprecated public long validToMillis;
-  @Deprecated public java.util.List<gr.grnet.aquarium.message.avro._ResourceType> resourceTypes;
+  @Deprecated public java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType> resourceTypes;
   @Deprecated public java.util.List<java.lang.CharSequence> chargingBehaviors;
-  @Deprecated public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable> roleMapping;
+  @Deprecated public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable> roleMapping;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -36,9 +36,9 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     case 1: parentID = (java.lang.CharSequence)value$; break;
     case 2: validFromMillis = (java.lang.Long)value$; break;
     case 3: validToMillis = (java.lang.Long)value$; break;
-    case 4: resourceTypes = (java.util.List<gr.grnet.aquarium.message.avro._ResourceType>)value$; break;
+    case 4: resourceTypes = (java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType>)value$; break;
     case 5: chargingBehaviors = (java.util.List<java.lang.CharSequence>)value$; break;
-    case 6: roleMapping = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable>)value$; break;
+    case 6: roleMapping = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable>)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -106,7 +106,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
   /**
    * Gets the value of the 'resourceTypes' field.
    */
-  public java.util.List<gr.grnet.aquarium.message.avro._ResourceType> getResourceTypes() {
+  public java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType> getResourceTypes() {
     return resourceTypes;
   }
 
@@ -114,7 +114,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
    * Sets the value of the 'resourceTypes' field.
    * @param value the value to set.
    */
-  public void setResourceTypes(java.util.List<gr.grnet.aquarium.message.avro._ResourceType> value) {
+  public void setResourceTypes(java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType> value) {
     this.resourceTypes = value;
   }
 
@@ -136,7 +136,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
   /**
    * Gets the value of the 'roleMapping' field.
    */
-  public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable> getRoleMapping() {
+  public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable> getRoleMapping() {
     return roleMapping;
   }
 
@@ -144,23 +144,23 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
    * Sets the value of the 'roleMapping' field.
    * @param value the value to set.
    */
-  public void setRoleMapping(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable> value) {
+  public void setRoleMapping(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable> value) {
     this.roleMapping = value;
   }
 
   /** Creates a new _Policy RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._Policy.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._Policy.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._Policy.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._Policy.Builder();
   }
   
   /** Creates a new _Policy RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._Policy.Builder newBuilder(gr.grnet.aquarium.message.avro._Policy.Builder other) {
-    return new gr.grnet.aquarium.message.avro._Policy.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._Policy.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._Policy.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._Policy.Builder(other);
   }
   
   /** Creates a new _Policy RecordBuilder by copying an existing _Policy instance */
-  public static gr.grnet.aquarium.message.avro._Policy.Builder newBuilder(gr.grnet.aquarium.message.avro._Policy other) {
-    return new gr.grnet.aquarium.message.avro._Policy.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._Policy.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._Policy other) {
+    return new gr.grnet.aquarium.message.avro.gen._Policy.Builder(other);
   }
   
   /**
@@ -173,23 +173,23 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     private java.lang.CharSequence parentID;
     private long validFromMillis;
     private long validToMillis;
-    private java.util.List<gr.grnet.aquarium.message.avro._ResourceType> resourceTypes;
+    private java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType> resourceTypes;
     private java.util.List<java.lang.CharSequence> chargingBehaviors;
-    private java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable> roleMapping;
+    private java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable> roleMapping;
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._Policy.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._Policy.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._Policy.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._Policy.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _Policy instance */
-    private Builder(gr.grnet.aquarium.message.avro._Policy other) {
-            super(gr.grnet.aquarium.message.avro._Policy.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._Policy other) {
+            super(gr.grnet.aquarium.message.avro.gen._Policy.SCHEMA$);
       if (isValidValue(fields()[0], other.ID)) {
         this.ID = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.ID);
         fieldSetFlags()[0] = true;
@@ -207,7 +207,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
         fieldSetFlags()[3] = true;
       }
       if (isValidValue(fields()[4], other.resourceTypes)) {
-        this.resourceTypes = (java.util.List<gr.grnet.aquarium.message.avro._ResourceType>) data().deepCopy(fields()[4].schema(), other.resourceTypes);
+        this.resourceTypes = (java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType>) data().deepCopy(fields()[4].schema(), other.resourceTypes);
         fieldSetFlags()[4] = true;
       }
       if (isValidValue(fields()[5], other.chargingBehaviors)) {
@@ -215,7 +215,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
         fieldSetFlags()[5] = true;
       }
       if (isValidValue(fields()[6], other.roleMapping)) {
-        this.roleMapping = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable>) data().deepCopy(fields()[6].schema(), other.roleMapping);
+        this.roleMapping = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable>) data().deepCopy(fields()[6].schema(), other.roleMapping);
         fieldSetFlags()[6] = true;
       }
     }
@@ -226,7 +226,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Sets the value of the 'ID' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setID(java.lang.CharSequence value) {
       validate(fields()[0], value);
       this.ID = value;
       fieldSetFlags()[0] = true;
@@ -239,7 +239,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'ID' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearID() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearID() {
       ID = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -251,7 +251,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Sets the value of the 'parentID' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setParentID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setParentID(java.lang.CharSequence value) {
       validate(fields()[1], value);
       this.parentID = value;
       fieldSetFlags()[1] = true;
@@ -264,7 +264,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'parentID' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearParentID() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearParentID() {
       parentID = null;
       fieldSetFlags()[1] = false;
       return this;
@@ -276,7 +276,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Sets the value of the 'validFromMillis' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setValidFromMillis(long value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setValidFromMillis(long value) {
       validate(fields()[2], value);
       this.validFromMillis = value;
       fieldSetFlags()[2] = true;
@@ -289,7 +289,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'validFromMillis' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearValidFromMillis() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearValidFromMillis() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -300,7 +300,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Sets the value of the 'validToMillis' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setValidToMillis(long value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setValidToMillis(long value) {
       validate(fields()[3], value);
       this.validToMillis = value;
       fieldSetFlags()[3] = true;
@@ -313,18 +313,18 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'validToMillis' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearValidToMillis() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearValidToMillis() {
       fieldSetFlags()[3] = false;
       return this;
     }
 
     /** Gets the value of the 'resourceTypes' field */
-    public java.util.List<gr.grnet.aquarium.message.avro._ResourceType> getResourceTypes() {
+    public java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType> getResourceTypes() {
       return resourceTypes;
     }
     
     /** Sets the value of the 'resourceTypes' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setResourceTypes(java.util.List<gr.grnet.aquarium.message.avro._ResourceType> value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setResourceTypes(java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType> value) {
       validate(fields()[4], value);
       this.resourceTypes = value;
       fieldSetFlags()[4] = true;
@@ -337,7 +337,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'resourceTypes' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearResourceTypes() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearResourceTypes() {
       resourceTypes = null;
       fieldSetFlags()[4] = false;
       return this;
@@ -349,7 +349,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Sets the value of the 'chargingBehaviors' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setChargingBehaviors(java.util.List<java.lang.CharSequence> value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setChargingBehaviors(java.util.List<java.lang.CharSequence> value) {
       validate(fields()[5], value);
       this.chargingBehaviors = value;
       fieldSetFlags()[5] = true;
@@ -362,19 +362,19 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'chargingBehaviors' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearChargingBehaviors() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearChargingBehaviors() {
       chargingBehaviors = null;
       fieldSetFlags()[5] = false;
       return this;
     }
 
     /** Gets the value of the 'roleMapping' field */
-    public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable> getRoleMapping() {
+    public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable> getRoleMapping() {
       return roleMapping;
     }
     
     /** Sets the value of the 'roleMapping' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder setRoleMapping(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable> value) {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder setRoleMapping(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable> value) {
       validate(fields()[6], value);
       this.roleMapping = value;
       fieldSetFlags()[6] = true;
@@ -387,7 +387,7 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
     }
     
     /** Clears the value of the 'roleMapping' field */
-    public gr.grnet.aquarium.message.avro._Policy.Builder clearRoleMapping() {
+    public gr.grnet.aquarium.message.avro.gen._Policy.Builder clearRoleMapping() {
       roleMapping = null;
       fieldSetFlags()[6] = false;
       return this;
@@ -401,9 +401,9 @@ public class _Policy extends org.apache.avro.specific.SpecificRecordBase impleme
         record.parentID = fieldSetFlags()[1] ? this.parentID : (java.lang.CharSequence) defaultValue(fields()[1]);
         record.validFromMillis = fieldSetFlags()[2] ? this.validFromMillis : (java.lang.Long) defaultValue(fields()[2]);
         record.validToMillis = fieldSetFlags()[3] ? this.validToMillis : (java.lang.Long) defaultValue(fields()[3]);
-        record.resourceTypes = fieldSetFlags()[4] ? this.resourceTypes : (java.util.List<gr.grnet.aquarium.message.avro._ResourceType>) defaultValue(fields()[4]);
+        record.resourceTypes = fieldSetFlags()[4] ? this.resourceTypes : (java.util.List<gr.grnet.aquarium.message.avro.gen._ResourceType>) defaultValue(fields()[4]);
         record.chargingBehaviors = fieldSetFlags()[5] ? this.chargingBehaviors : (java.util.List<java.lang.CharSequence>) defaultValue(fields()[5]);
-        record.roleMapping = fieldSetFlags()[6] ? this.roleMapping : (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._FullPriceTable>) defaultValue(fields()[6]);
+        record.roleMapping = fieldSetFlags()[6] ? this.roleMapping : (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._FullPriceTable>) defaultValue(fields()[6]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -3,10 +3,10 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_ResourceEvent\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"resource\",\"type\":\"string\",\"aliases\":[\"resourceType\"]},{\"name\":\"instanceID\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]}}}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_ResourceEvent\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"aliases\":[\"originalID\",\"ID\"]},{\"name\":\"idInStore\",\"type\":\"string\"},{\"name\":\"occurredMillis\",\"type\":\"long\"},{\"name\":\"receivedMillis\",\"type\":\"long\",\"default\":0},{\"name\":\"userID\",\"type\":\"string\"},{\"name\":\"clientID\",\"type\":\"string\"},{\"name\":\"eventVersion\",\"type\":\"string\",\"default\":\"1.0\"},{\"name\":\"resource\",\"type\":\"string\",\"aliases\":[\"resourceType\"]},{\"name\":\"instanceID\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"string\"},{\"name\":\"details\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"record\",\"name\":\"_AnyValue\",\"fields\":[{\"name\":\"anyValue\",\"type\":[\"null\",\"int\",\"long\",\"boolean\",\"double\",\"bytes\",\"string\"]}]}}}]}");
   @Deprecated public java.lang.CharSequence id;
   @Deprecated public java.lang.CharSequence idInStore;
   @Deprecated public long occurredMillis;
@@ -17,7 +17,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
   @Deprecated public java.lang.CharSequence resource;
   @Deprecated public java.lang.CharSequence instanceID;
   @Deprecated public java.lang.CharSequence value;
-  @Deprecated public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> details;
+  @Deprecated public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> details;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -50,7 +50,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     case 7: resource = (java.lang.CharSequence)value$; break;
     case 8: instanceID = (java.lang.CharSequence)value$; break;
     case 9: value = (java.lang.CharSequence)value$; break;
-    case 10: details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue>)value$; break;
+    case 10: details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue>)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -208,7 +208,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
   /**
    * Gets the value of the 'details' field.
    */
-  public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> getDetails() {
+  public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> getDetails() {
     return details;
   }
 
@@ -216,23 +216,23 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
    * Sets the value of the 'details' field.
    * @param value the value to set.
    */
-  public void setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> value) {
+  public void setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> value) {
     this.details = value;
   }
 
   /** Creates a new _ResourceEvent RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._ResourceEvent.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._ResourceEvent.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder();
   }
   
   /** Creates a new _ResourceEvent RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._ResourceEvent.Builder newBuilder(gr.grnet.aquarium.message.avro._ResourceEvent.Builder other) {
-    return new gr.grnet.aquarium.message.avro._ResourceEvent.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder(other);
   }
   
   /** Creates a new _ResourceEvent RecordBuilder by copying an existing _ResourceEvent instance */
-  public static gr.grnet.aquarium.message.avro._ResourceEvent.Builder newBuilder(gr.grnet.aquarium.message.avro._ResourceEvent other) {
-    return new gr.grnet.aquarium.message.avro._ResourceEvent.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._ResourceEvent other) {
+    return new gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder(other);
   }
   
   /**
@@ -251,21 +251,21 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     private java.lang.CharSequence resource;
     private java.lang.CharSequence instanceID;
     private java.lang.CharSequence value;
-    private java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> details;
+    private java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> details;
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._ResourceEvent.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._ResourceEvent.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._ResourceEvent.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _ResourceEvent instance */
-    private Builder(gr.grnet.aquarium.message.avro._ResourceEvent other) {
-            super(gr.grnet.aquarium.message.avro._ResourceEvent.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._ResourceEvent other) {
+            super(gr.grnet.aquarium.message.avro.gen._ResourceEvent.SCHEMA$);
       if (isValidValue(fields()[0], other.id)) {
         this.id = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.id);
         fieldSetFlags()[0] = true;
@@ -307,7 +307,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
         fieldSetFlags()[9] = true;
       }
       if (isValidValue(fields()[10], other.details)) {
-        this.details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue>) data().deepCopy(fields()[10].schema(), other.details);
+        this.details = (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue>) data().deepCopy(fields()[10].schema(), other.details);
         fieldSetFlags()[10] = true;
       }
     }
@@ -318,7 +318,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'id' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setId(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setId(java.lang.CharSequence value) {
       validate(fields()[0], value);
       this.id = value;
       fieldSetFlags()[0] = true;
@@ -331,7 +331,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'id' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearId() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearId() {
       id = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -343,7 +343,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'idInStore' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setIdInStore(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setIdInStore(java.lang.CharSequence value) {
       validate(fields()[1], value);
       this.idInStore = value;
       fieldSetFlags()[1] = true;
@@ -356,7 +356,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'idInStore' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearIdInStore() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearIdInStore() {
       idInStore = null;
       fieldSetFlags()[1] = false;
       return this;
@@ -368,7 +368,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'occurredMillis' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setOccurredMillis(long value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setOccurredMillis(long value) {
       validate(fields()[2], value);
       this.occurredMillis = value;
       fieldSetFlags()[2] = true;
@@ -381,7 +381,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'occurredMillis' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearOccurredMillis() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearOccurredMillis() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -392,7 +392,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'receivedMillis' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setReceivedMillis(long value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setReceivedMillis(long value) {
       validate(fields()[3], value);
       this.receivedMillis = value;
       fieldSetFlags()[3] = true;
@@ -405,7 +405,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'receivedMillis' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearReceivedMillis() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearReceivedMillis() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -416,7 +416,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'userID' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setUserID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setUserID(java.lang.CharSequence value) {
       validate(fields()[4], value);
       this.userID = value;
       fieldSetFlags()[4] = true;
@@ -429,7 +429,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'userID' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearUserID() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearUserID() {
       userID = null;
       fieldSetFlags()[4] = false;
       return this;
@@ -441,7 +441,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'clientID' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setClientID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setClientID(java.lang.CharSequence value) {
       validate(fields()[5], value);
       this.clientID = value;
       fieldSetFlags()[5] = true;
@@ -454,7 +454,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'clientID' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearClientID() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearClientID() {
       clientID = null;
       fieldSetFlags()[5] = false;
       return this;
@@ -466,7 +466,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'eventVersion' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setEventVersion(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setEventVersion(java.lang.CharSequence value) {
       validate(fields()[6], value);
       this.eventVersion = value;
       fieldSetFlags()[6] = true;
@@ -479,7 +479,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'eventVersion' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearEventVersion() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearEventVersion() {
       eventVersion = null;
       fieldSetFlags()[6] = false;
       return this;
@@ -491,7 +491,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'resource' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setResource(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setResource(java.lang.CharSequence value) {
       validate(fields()[7], value);
       this.resource = value;
       fieldSetFlags()[7] = true;
@@ -504,7 +504,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'resource' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearResource() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearResource() {
       resource = null;
       fieldSetFlags()[7] = false;
       return this;
@@ -516,7 +516,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'instanceID' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setInstanceID(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setInstanceID(java.lang.CharSequence value) {
       validate(fields()[8], value);
       this.instanceID = value;
       fieldSetFlags()[8] = true;
@@ -529,7 +529,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'instanceID' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearInstanceID() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearInstanceID() {
       instanceID = null;
       fieldSetFlags()[8] = false;
       return this;
@@ -541,7 +541,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'value' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setValue(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setValue(java.lang.CharSequence value) {
       validate(fields()[9], value);
       this.value = value;
       fieldSetFlags()[9] = true;
@@ -554,19 +554,19 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'value' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearValue() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearValue() {
       value = null;
       fieldSetFlags()[9] = false;
       return this;
     }
 
     /** Gets the value of the 'details' field */
-    public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> getDetails() {
+    public java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> getDetails() {
       return details;
     }
     
     /** Sets the value of the 'details' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue> value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder setDetails(java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue> value) {
       validate(fields()[10], value);
       this.details = value;
       fieldSetFlags()[10] = true;
@@ -579,7 +579,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'details' field */
-    public gr.grnet.aquarium.message.avro._ResourceEvent.Builder clearDetails() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceEvent.Builder clearDetails() {
       details = null;
       fieldSetFlags()[10] = false;
       return this;
@@ -599,7 +599,7 @@ public class _ResourceEvent extends org.apache.avro.specific.SpecificRecordBase
         record.resource = fieldSetFlags()[7] ? this.resource : (java.lang.CharSequence) defaultValue(fields()[7]);
         record.instanceID = fieldSetFlags()[8] ? this.instanceID : (java.lang.CharSequence) defaultValue(fields()[8]);
         record.value = fieldSetFlags()[9] ? this.value : (java.lang.CharSequence) defaultValue(fields()[9]);
-        record.details = fieldSetFlags()[10] ? this.details : (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro._AnyValue>) defaultValue(fields()[10]);
+        record.details = fieldSetFlags()[10] ? this.details : (java.util.Map<java.lang.CharSequence,gr.grnet.aquarium.message.avro.gen._AnyValue>) defaultValue(fields()[10]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -3,10 +3,10 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_ResourceType\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"unit\",\"type\":\"string\"},{\"name\":\"chargingBehaviorClass\",\"type\":\"string\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_ResourceType\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"unit\",\"type\":\"string\"},{\"name\":\"chargingBehaviorClass\",\"type\":\"string\"}]}");
   @Deprecated public java.lang.CharSequence name;
   @Deprecated public java.lang.CharSequence unit;
   @Deprecated public java.lang.CharSequence chargingBehaviorClass;
@@ -77,18 +77,18 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
   }
 
   /** Creates a new _ResourceType RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._ResourceType.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._ResourceType.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._ResourceType.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._ResourceType.Builder();
   }
   
   /** Creates a new _ResourceType RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._ResourceType.Builder newBuilder(gr.grnet.aquarium.message.avro._ResourceType.Builder other) {
-    return new gr.grnet.aquarium.message.avro._ResourceType.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._ResourceType.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._ResourceType.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._ResourceType.Builder(other);
   }
   
   /** Creates a new _ResourceType RecordBuilder by copying an existing _ResourceType instance */
-  public static gr.grnet.aquarium.message.avro._ResourceType.Builder newBuilder(gr.grnet.aquarium.message.avro._ResourceType other) {
-    return new gr.grnet.aquarium.message.avro._ResourceType.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._ResourceType.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._ResourceType other) {
+    return new gr.grnet.aquarium.message.avro.gen._ResourceType.Builder(other);
   }
   
   /**
@@ -103,17 +103,17 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._ResourceType.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._ResourceType.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._ResourceType.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._ResourceType.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _ResourceType instance */
-    private Builder(gr.grnet.aquarium.message.avro._ResourceType other) {
-            super(gr.grnet.aquarium.message.avro._ResourceType.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._ResourceType other) {
+            super(gr.grnet.aquarium.message.avro.gen._ResourceType.SCHEMA$);
       if (isValidValue(fields()[0], other.name)) {
         this.name = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.name);
         fieldSetFlags()[0] = true;
@@ -134,7 +134,7 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
     }
     
     /** Sets the value of the 'name' field */
-    public gr.grnet.aquarium.message.avro._ResourceType.Builder setName(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceType.Builder setName(java.lang.CharSequence value) {
       validate(fields()[0], value);
       this.name = value;
       fieldSetFlags()[0] = true;
@@ -147,7 +147,7 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
     }
     
     /** Clears the value of the 'name' field */
-    public gr.grnet.aquarium.message.avro._ResourceType.Builder clearName() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceType.Builder clearName() {
       name = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -159,7 +159,7 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
     }
     
     /** Sets the value of the 'unit' field */
-    public gr.grnet.aquarium.message.avro._ResourceType.Builder setUnit(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceType.Builder setUnit(java.lang.CharSequence value) {
       validate(fields()[1], value);
       this.unit = value;
       fieldSetFlags()[1] = true;
@@ -172,7 +172,7 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
     }
     
     /** Clears the value of the 'unit' field */
-    public gr.grnet.aquarium.message.avro._ResourceType.Builder clearUnit() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceType.Builder clearUnit() {
       unit = null;
       fieldSetFlags()[1] = false;
       return this;
@@ -184,7 +184,7 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
     }
     
     /** Sets the value of the 'chargingBehaviorClass' field */
-    public gr.grnet.aquarium.message.avro._ResourceType.Builder setChargingBehaviorClass(java.lang.CharSequence value) {
+    public gr.grnet.aquarium.message.avro.gen._ResourceType.Builder setChargingBehaviorClass(java.lang.CharSequence value) {
       validate(fields()[2], value);
       this.chargingBehaviorClass = value;
       fieldSetFlags()[2] = true;
@@ -197,7 +197,7 @@ public class _ResourceType extends org.apache.avro.specific.SpecificRecordBase i
     }
     
     /** Clears the value of the 'chargingBehaviorClass' field */
-    public gr.grnet.aquarium.message.avro._ResourceType.Builder clearChargingBehaviorClass() {
+    public gr.grnet.aquarium.message.avro.gen._ResourceType.Builder clearChargingBehaviorClass() {
       chargingBehaviorClass = null;
       fieldSetFlags()[2] = false;
       return this;
@@ -3,10 +3,10 @@
  * 
  * DO NOT EDIT DIRECTLY
  */
-package gr.grnet.aquarium.message.avro;  
+package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class _SelectorValue extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_SelectorValue\",\"namespace\":\"gr.grnet.aquarium.message.avro\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]},{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"_SelectorValue\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"selectorValue\",\"type\":[{\"type\":\"record\",\"name\":\"_EffectivePriceTable\",\"fields\":[{\"name\":\"priceOverrides\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"_EffectiveUnitPrice\",\"fields\":[{\"name\":\"unitPrice\",\"type\":\"double\"},{\"name\":\"when\",\"type\":[{\"type\":\"record\",\"name\":\"_CronSpecTuple\",\"fields\":[{\"name\":\"a\",\"type\":\"string\"},{\"name\":\"b\",\"type\":\"string\"}]},\"null\"]}]}}}]},{\"type\":\"map\",\"values\":\"_SelectorValue\"}]}]}");
   @Deprecated public java.lang.Object selectorValue;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
@@ -41,18 +41,18 @@ public class _SelectorValue extends org.apache.avro.specific.SpecificRecordBase
   }
 
   /** Creates a new _SelectorValue RecordBuilder */
-  public static gr.grnet.aquarium.message.avro._SelectorValue.Builder newBuilder() {
-    return new gr.grnet.aquarium.message.avro._SelectorValue.Builder();
+  public static gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder newBuilder() {
+    return new gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder();
   }
   
   /** Creates a new _SelectorValue RecordBuilder by copying an existing Builder */
-  public static gr.grnet.aquarium.message.avro._SelectorValue.Builder newBuilder(gr.grnet.aquarium.message.avro._SelectorValue.Builder other) {
-    return new gr.grnet.aquarium.message.avro._SelectorValue.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder other) {
+    return new gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder(other);
   }
   
   /** Creates a new _SelectorValue RecordBuilder by copying an existing _SelectorValue instance */
-  public static gr.grnet.aquarium.message.avro._SelectorValue.Builder newBuilder(gr.grnet.aquarium.message.avro._SelectorValue other) {
-    return new gr.grnet.aquarium.message.avro._SelectorValue.Builder(other);
+  public static gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder newBuilder(gr.grnet.aquarium.message.avro.gen._SelectorValue other) {
+    return new gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder(other);
   }
   
   /**
@@ -65,17 +65,17 @@ public class _SelectorValue extends org.apache.avro.specific.SpecificRecordBase
 
     /** Creates a new Builder */
     private Builder() {
-      super(gr.grnet.aquarium.message.avro._SelectorValue.SCHEMA$);
+      super(gr.grnet.aquarium.message.avro.gen._SelectorValue.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(gr.grnet.aquarium.message.avro._SelectorValue.Builder other) {
+    private Builder(gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing _SelectorValue instance */
-    private Builder(gr.grnet.aquarium.message.avro._SelectorValue other) {
-            super(gr.grnet.aquarium.message.avro._SelectorValue.SCHEMA$);
+    private Builder(gr.grnet.aquarium.message.avro.gen._SelectorValue other) {
+            super(gr.grnet.aquarium.message.avro.gen._SelectorValue.SCHEMA$);
       if (isValidValue(fields()[0], other.selectorValue)) {
         this.selectorValue = (java.lang.Object) data().deepCopy(fields()[0].schema(), other.selectorValue);
         fieldSetFlags()[0] = true;
@@ -88,7 +88,7 @@ public class _SelectorValue extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Sets the value of the 'selectorValue' field */
-    public gr.grnet.aquarium.message.avro._SelectorValue.Builder setSelectorValue(java.lang.Object value) {
+    public gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder setSelectorValue(java.lang.Object value) {
       validate(fields()[0], value);
       this.selectorValue = value;
       fieldSetFlags()[0] = true;
@@ -101,7 +101,7 @@ public class _SelectorValue extends org.apache.avro.specific.SpecificRecordBase
     }
     
     /** Clears the value of the 'selectorValue' field */
-    public gr.grnet.aquarium.message.avro._SelectorValue.Builder clearSelectorValue() {
+    public gr.grnet.aquarium.message.avro.gen._SelectorValue.Builder clearSelectorValue() {
       selectorValue = null;
       fieldSetFlags()[0] = false;
       return this;
index 5074cc7..17e4dd1 100644 (file)
 
 package gr.grnet.aquarium.message.avro
 
-import scala.collection.JavaConverters.seqAsJavaListConverter
+import gr.grnet.aquarium.message.avro.gen._
 import scala.collection.JavaConverters.mapAsJavaMapConverter
+import scala.collection.JavaConverters.seqAsJavaListConverter
+
 /**
  *
  * @author Christos KK Loverdos <loverdos@gmail.com>
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.message.avro
+package gr.grnet.aquarium.message.avro.gen
 
 import gr.grnet.aquarium.charging.VMChargingBehavior
 import gr.grnet.aquarium.message.avro.MessageFactory._
 import gr.grnet.aquarium.util.nameOfClass
 import org.junit.Test
+import gr.grnet.aquarium.message.avro.AvroHelpers
 
 /**
  *
@@ -49,37 +50,37 @@ class PolicyTest {
   def testOne() {
     val policyConf = _Policy.newBuilder().
       setChargingBehaviors(newChargingBehaviors(
-        nameOfClass[gr.grnet.aquarium.charging.VMChargingBehavior],
-        nameOfClass[gr.grnet.aquarium.charging.ContinuousChargingBehavior],
-        nameOfClass[gr.grnet.aquarium.charging.OnceChargingBehavior])
-      ).
+      nameOfClass[gr.grnet.aquarium.charging.VMChargingBehavior],
+      nameOfClass[gr.grnet.aquarium.charging.ContinuousChargingBehavior],
+      nameOfClass[gr.grnet.aquarium.charging.OnceChargingBehavior])
+    ).
       setID("default-policy").
       setParentID("").
       setValidFromMillis(0L).
       setValidToMillis(Long.MaxValue).
       setResourceTypes(newResourceTypes(
-        newResourceType("diskspace", "MB/Hr", nameOfClass[gr.grnet.aquarium.charging.ContinuousChargingBehavior]),
-        newResourceType("vmtime", "Hr", nameOfClass[gr.grnet.aquarium.charging.VMChargingBehavior]),
-        newResourceType("addcredits", "Credits", nameOfClass[gr.grnet.aquarium.charging.OnceChargingBehavior]))
-      ).
+      newResourceType("diskspace", "MB/Hr", nameOfClass[gr.grnet.aquarium.charging.ContinuousChargingBehavior]),
+      newResourceType("vmtime", "Hr", nameOfClass[gr.grnet.aquarium.charging.VMChargingBehavior]),
+      newResourceType("addcredits", "Credits", nameOfClass[gr.grnet.aquarium.charging.OnceChargingBehavior]))
+    ).
       setRoleMapping(newRoleMapping(
-        "default" -> newFullPriceTable(
-          "diskspace" -> Map(
-            "default" -> newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(0.01)))
-          ),
+      "default" -> newFullPriceTable(
+        "diskspace" -> Map(
+          "default" -> newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(0.01)))
+        ),
 
-          "vmtime" -> Map(
-            VMChargingBehavior.Selectors.Power.powerOff ->
-              newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(0.001))),
-            VMChargingBehavior.Selectors.Power.powerOn ->
-              newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(0.01)))
-          ),
-          "addcredits" -> Map(
-            "default" -> newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(-1.0)))
-          )
+        "vmtime" -> Map(
+          VMChargingBehavior.Selectors.Power.powerOff ->
+            newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(0.001))),
+          VMChargingBehavior.Selectors.Power.powerOn ->
+            newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(0.01)))
+        ),
+        "addcredits" -> Map(
+          "default" -> newSelectorValue(newEffectivePriceTable(newEffectiveUnitPrice(-1.0)))
         )
-      )).
-    build()
+      )
+    )).
+      build()
 
     val generatedJSON = AvroHelpers.jsonStringOfSpecificRecord(policyConf)
     println(generatedJSON)
@@ -33,7 +33,7 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.message.avro
+package gr.grnet.aquarium.message.avro.gen
 
 import java.io.ByteArrayOutputStream
 import org.apache.avro.io.{EncoderFactory, Encoder, JsonEncoder}
@@ -122,7 +122,7 @@ class ResourceEventTest {
       setUserID("foouser").
       setValue("123.32").
       setDetails(new util.HashMap[CharSequence, _AnyValue]()).
-    build()
+      build()
 
     val schema = rcEvent.getSchema
     val out = new ByteArrayOutputStream()