Code reorganization

diff --git a/src/main/scala/gr/grnet/aquarium/actor/message/service/dispatcher/DispatcherMessage.scala b/src/main/scala/gr/grnet/aquarium/actor/message/service/dispatcher/DispatcherMessage.scala
index a0e329d..62bb60f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/message/service/dispatcher/DispatcherMessage.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/message/service/dispatcher/DispatcherMessage.scala
@@ -37,9 +37,9 @@ package gr.grnet.aquarium.actor.message
 package service
 package dispatcher
 
-import gr.grnet.aquarium.logic.events.{ResourceEvent, UserEvent}
 import gr.grnet.aquarium.user.UserState
 import gr.grnet.aquarium.util.json.{JsonHelpers, JsonSupport}
+import gr.grnet.aquarium.events.{UserEvent, ResourceEvent}
 
 
 /**

diff --git a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
index dbb4b86..5e0aeb4 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
@@ -43,7 +43,6 @@ import com.ckkloverdos.maybe.{Failed, NoVal, Just}
 import gr.grnet.aquarium.actor._
 import gr.grnet.aquarium.Configurator
 import gr.grnet.aquarium.user._
-import gr.grnet.aquarium.logic.events.{UserEvent, WalletEntry}
 
 import gr.grnet.aquarium.util.Loggable
 import gr.grnet.aquarium.util.date.TimeHelpers
@@ -52,6 +51,7 @@ import gr.grnet.aquarium.messaging.AkkaAMQP
 import gr.grnet.aquarium.actor.message.config.user.UserActorInitWithUserId
 import gr.grnet.aquarium.actor.message.service.dispatcher._
 import message.config.{ActorProviderConfigured, AquariumPropertiesLoaded}
+import gr.grnet.aquarium.events.{WalletEntry, UserEvent}
 
 
 /**

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala b/src/main/scala/gr/grnet/aquarium/events/AquariumEvent.scala
similarity index 99%
rename from src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
rename to src/main/scala/gr/grnet/aquarium/events/AquariumEvent.scala
index ef8c892..96fb1e5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/events/AquariumEvent.scala
@@ -34,7 +34,7 @@
  */
 
 package gr.grnet.aquarium
-package logic.events
+package events
 
 
 import util.json.JsonSupport

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala b/src/main/scala/gr/grnet/aquarium/events/NewWalletEntry.scala
similarity index 99%
rename from src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
rename to src/main/scala/gr/grnet/aquarium/events/NewWalletEntry.scala
index 5269a31..4797d20 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/events/NewWalletEntry.scala
@@ -33,7 +33,8 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.logic.events
+package gr.grnet.aquarium
+package events
 
 import gr.grnet.aquarium.logic.accounting.Chargeslot
 import gr.grnet.aquarium.util.json.JsonHelpers

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala b/src/main/scala/gr/grnet/aquarium/events/PolicyEntry.scala
similarity index 98%
rename from src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala
rename to src/main/scala/gr/grnet/aquarium/events/PolicyEntry.scala
index 3108a99..10b1200 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/events/PolicyEntry.scala
@@ -33,7 +33,8 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.logic.events
+package gr.grnet.aquarium
+package events
 
 import net.liftweb.json.{Extraction, parse => parseJson}
 import gr.grnet.aquarium.util.json.JsonHelpers

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala b/src/main/scala/gr/grnet/aquarium/events/ResourceEvent.scala
similarity index 99%
rename from src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
rename to src/main/scala/gr/grnet/aquarium/events/ResourceEvent.scala
index e34bb0d..16a4b7f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/events/ResourceEvent.scala
@@ -33,7 +33,8 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.logic.events
+package gr.grnet.aquarium
+package events
 
 import net.liftweb.json.{JsonAST, Xml}
 import gr.grnet.aquarium.util.json.JsonHelpers

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala b/src/main/scala/gr/grnet/aquarium/events/UserEvent.scala
similarity index 99%
rename from src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
rename to src/main/scala/gr/grnet/aquarium/events/UserEvent.scala
index cd6da08..c19d6d7 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/events/UserEvent.scala
@@ -33,7 +33,8 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.logic.events
+package gr.grnet.aquarium
+package events
 
 import gr.grnet.aquarium.util.json.JsonHelpers
 import net.liftweb.json.{Extraction, parse => parseJson}

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala b/src/main/scala/gr/grnet/aquarium/events/WalletEntry.scala
similarity index 98%
rename from src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala
rename to src/main/scala/gr/grnet/aquarium/events/WalletEntry.scala
index 3463075..27e904d 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/events/WalletEntry.scala
@@ -33,7 +33,8 @@
  * or implied, of GRNET S.A.
  */
 
-package gr.grnet.aquarium.logic.events
+package gr.grnet.aquarium
+package events
 
 import gr.grnet.aquarium.util.json.JsonHelpers
 import java.util.Date

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
index aeb9a43..c92849f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
@@ -38,7 +38,6 @@ package gr.grnet.aquarium.logic.accounting
 import gr.grnet.aquarium.util.shortClassNameOf
 import algorithm.CostPolicyAlgorithmCompiler
 import dsl._
-import gr.grnet.aquarium.logic.events.{WalletEntry, ResourceEvent}
 import collection.immutable.SortedMap
 import java.util.Date
 import com.ckkloverdos.maybe.{NoVal, Maybe, Failed, Just}
@@ -46,6 +45,7 @@ import gr.grnet.aquarium.util.date.MutableDateCalc
 import gr.grnet.aquarium.util.{ContextualLogger, CryptoUtils, Loggable}
 import gr.grnet.aquarium.store.PolicyStore
 import gr.grnet.aquarium.AquariumException
+import gr.grnet.aquarium.events.{WalletEntry, ResourceEvent}
 
 /**
  * A timeslot together with the algorithm and unit price that apply for this particular timeslot.

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicy.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicy.scala
index f180109..161c182 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicy.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicy.scala
@@ -36,7 +36,7 @@
 package gr.grnet.aquarium.logic.accounting.dsl
 
 import com.ckkloverdos.maybe.{NoVal, Failed, Just, Maybe}
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 import gr.grnet.aquarium.AquariumException
 
 /**
@@ -112,7 +112,7 @@ abstract class DSLCostPolicy(val name: String, val vars: Set[DSLCostPolicyVar])
    * in which case it is ignored.
    *
    * @param oldAmount the old accumulating amount
-   * @param newEventValue the value contained in a newly arrived [[gr.grnet.aquarium.logic.events.ResourceEvent]]
+   * @param newEventValue the value contained in a newly arrived [[gr.grnet.aquarium.events.ResourceEvent]]
    * @return
    */
   def computeNewAccumulatingAmount(oldAmount: Double, newEventValue: Double): Double

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPolicy.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPolicy.scala
index 7512158..e000e5d 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPolicy.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPolicy.scala
@@ -35,9 +35,9 @@
 
 package gr.grnet.aquarium.logic.accounting.dsl
 
-import gr.grnet.aquarium.logic.events.PolicyEntry
 import gr.grnet.aquarium.util.CryptoUtils
 import gr.grnet.aquarium.util.date.TimeHelpers
+import gr.grnet.aquarium.events.PolicyEntry
 
 /**
  * Root object for the Aquarium policy configuration tree.

diff --git a/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala
index 3c40678..d9fb359 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala
@@ -48,9 +48,9 @@ import akka.config.Supervision.OneForOneStrategy
 import gr.grnet.aquarium.messaging.AkkaAMQP
 import akka.amqp._
 import java.util.concurrent.{ConcurrentHashMap, ConcurrentSkipListSet}
-import gr.grnet.aquarium.logic.events.AquariumEvent
 import gr.grnet.aquarium.Configurator
 import com.ckkloverdos.maybe._
+import gr.grnet.aquarium.events.AquariumEvent
 
 /**
  * An abstract service that retrieves Aquarium events from a queue,

diff --git a/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala
index 67c3abe..b639d28 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala
@@ -35,12 +35,12 @@
 
 package gr.grnet.aquarium.service
 
-import gr.grnet.aquarium.logic.events.ResourceEvent
 import gr.grnet.aquarium.actor.DispatcherRole
 import gr.grnet.aquarium.Configurator.Keys
 import gr.grnet.aquarium.store.LocalFSEventStore
 import com.ckkloverdos.maybe.{Maybe, Just, Failed, NoVal}
 import gr.grnet.aquarium.actor.message.service.dispatcher.ProcessResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 
 
 /**

diff --git a/src/main/scala/gr/grnet/aquarium/service/UserEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/UserEventProcessorService.scala
index aff6d5c..59952d9 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/UserEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/UserEventProcessorService.scala
@@ -35,7 +35,6 @@
 
 package gr.grnet.aquarium.service
 
-import gr.grnet.aquarium.logic.events.UserEvent
 import gr.grnet.aquarium.actor.DispatcherRole
 import gr.grnet.aquarium.Configurator.Keys
 import gr.grnet.aquarium.store.LocalFSEventStore
@@ -43,6 +42,7 @@ import gr.grnet.aquarium.util.makeString
 import com.ckkloverdos.maybe.{Maybe, NoVal, Failed, Just}
 import gr.grnet.aquarium.Configurator
 import gr.grnet.aquarium.actor.message.service.dispatcher.ProcessUserEvent
+import gr.grnet.aquarium.events.UserEvent
 
 /**
  * An event processor service for user events coming from the IM system

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala
index 85ba32c..059668a 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala
@@ -35,7 +35,8 @@
 
 package gr.grnet.aquarium.simulation
 
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
+
 
 /**
  * A simulator for a resource instance.

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala
index fedf230..c63cc4f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala
@@ -38,7 +38,7 @@ package gr.grnet.aquarium.simulation
 import java.util.Date
 import com.ckkloverdos.maybe.Maybe
 import gr.grnet.aquarium.store.RecordID
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 
 /**
  * A simulator for an instance of the standard `bandwidth` resource.

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala
index 3286032..29c3310 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala
@@ -35,7 +35,7 @@
 
 package gr.grnet.aquarium.simulation
 
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 import gr.grnet.aquarium.store.RecordID
 import com.ckkloverdos.maybe.Maybe
 import java.util.Date

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala
index f9177d2..6dfe059 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala
@@ -40,7 +40,7 @@ import gr.grnet.aquarium.store.RecordID
 import com.ckkloverdos.maybe.Maybe
 import java.util.Date
 import gr.grnet.aquarium.util.date.MutableDateCalc
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 
 /**
  * A simulator for an instance of the standard `vmtime` resource.

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala
index 3b8531b..f3b8e07 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala
@@ -35,10 +35,10 @@
 package gr.grnet.aquarium.simulation
 
 import java.util.Date
-import gr.grnet.aquarium.logic.events.ResourceEvent
 import com.ckkloverdos.maybe.Maybe
-import gr.grnet.aquarium.store.{RecordID, ResourceEventStore}
+import gr.grnet.aquarium.store.RecordID
 import math.Ordering
+import gr.grnet.aquarium.events.ResourceEvent
 
 /**
  * A simulator for a user.

diff --git a/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala
index 81e5caa..1d9ad66 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala
@@ -37,10 +37,10 @@ package gr.grnet.aquarium.store
 
 import gr.grnet.aquarium.Configurator
 import java.io.{FileOutputStream, File}
-import gr.grnet.aquarium.logic.events.{UserEvent, ResourceEvent}
 import gr.grnet.aquarium.util.{Loggable, stringOfStackTrace}
 import gr.grnet.aquarium.util.date.{TimeHelpers, MutableDateCalc}
 import gr.grnet.aquarium.simulation.uid.{EAIOUUIDGenerator, UIDGenerator}
+import gr.grnet.aquarium.events.{UserEvent, ResourceEvent}
 
 /**
  * This is used whenever the property `events.store.folder` is setup in aquarium configuration.

diff --git a/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala b/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala
index ebf001e..426af84 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala
@@ -36,10 +36,10 @@
 package gr.grnet.aquarium.store
 
 import scala.collection.immutable
-import gr.grnet.aquarium.logic.events.PolicyEntry
 import collection.immutable.SortedMap
 import gr.grnet.aquarium.logic.accounting.dsl.{DSL, DSLPolicy, Timeslot}
 import com.ckkloverdos.maybe.{NoVal, Just, Maybe}
+import gr.grnet.aquarium.events.PolicyEntry
 
 /**
  * A store for serialized policy entries.

diff --git a/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
index 17966a8..af153c5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
@@ -36,7 +36,7 @@
 package gr.grnet.aquarium.store
 
 import com.ckkloverdos.maybe.Maybe
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 
 /**
  * An abstraction for Aquarium `ResourceEvent` stores.

diff --git a/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala
index 0d89e73..c4378bd 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala
@@ -36,7 +36,7 @@
 package gr.grnet.aquarium.store
 
 import com.ckkloverdos.maybe.Maybe
-import gr.grnet.aquarium.logic.events.UserEvent
+import gr.grnet.aquarium.events.UserEvent
 
 /**
  * Store for external user events

diff --git a/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala b/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala
index 856a958..2c515fe 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala
@@ -35,9 +35,9 @@
 
 package gr.grnet.aquarium.store
 
-import gr.grnet.aquarium.logic.events.{WalletEntry}
 import java.util.Date
 import com.ckkloverdos.maybe.Maybe
+import gr.grnet.aquarium.events.WalletEntry
 
 /**
  * A store for Wallet entries.

diff --git a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
index 18d2748..503575a 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
@@ -41,11 +41,11 @@ import gr.grnet.aquarium.store._
 import scala.collection.JavaConversions._
 import java.util.Date
 import collection.mutable.ConcurrentMap
-import gr.grnet.aquarium.logic.events.{WalletEntry, ResourceEvent, UserEvent, PolicyEntry}
 import java.util.concurrent.ConcurrentHashMap
 import gr.grnet.aquarium.user.UserState
 import gr.grnet.aquarium.simulation.uid.ConcurrentVMLocalUIDGenerator
 import gr.grnet.aquarium.{AquariumException, Configurable}
+import gr.grnet.aquarium.events.{UserEvent, WalletEntry, ResourceEvent, PolicyEntry}
 
 /**
  * An implementation of various stores that persists data in memory.

diff --git a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
index 932f137..1d0604a 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
@@ -39,22 +39,19 @@ import gr.grnet.aquarium.util.Loggable
 import com.mongodb.util.JSON
 import gr.grnet.aquarium.user.UserState
 import gr.grnet.aquarium.user.UserState.{JsonNames => UserStateJsonNames}
-import gr.grnet.aquarium.util.displayableObjectInfo
 import gr.grnet.aquarium.util.json.JsonSupport
 import collection.mutable.ListBuffer
 import gr.grnet.aquarium.store._
-import gr.grnet.aquarium.logic.events.ResourceEvent.{JsonNames => ResourceJsonNames}
-import gr.grnet.aquarium.logic.events.UserEvent.{JsonNames => UserEventJsonNames}
-import gr.grnet.aquarium.logic.events.WalletEntry.{JsonNames => WalletJsonNames}
-import gr.grnet.aquarium.logic.events.PolicyEntry.{JsonNames => PolicyJsonNames}
+import gr.grnet.aquarium.events.ResourceEvent.{JsonNames => ResourceJsonNames}
+import gr.grnet.aquarium.events.UserEvent.{JsonNames => UserEventJsonNames}
+import gr.grnet.aquarium.events.WalletEntry.{JsonNames => WalletJsonNames}
+import gr.grnet.aquarium.events.PolicyEntry.{JsonNames => PolicyJsonNames}
 import java.util.Date
 import gr.grnet.aquarium.logic.accounting.Policy
-import gr.grnet.aquarium.logic.events._
 import com.mongodb._
 import com.ckkloverdos.maybe.{NoVal, Maybe}
-import gr.grnet.aquarium.logic.accounting.dsl.{DSLResource, Timeslot, DSLPolicy, DSLComplexResource}
 import org.bson.types.ObjectId
-import gr.grnet.aquarium.actor.service.user.UserActor
+import gr.grnet.aquarium.events._
 
 /**
  * Mongodb implementation of the various aquarium stores.
@@ -356,7 +353,7 @@ object MongoDBStore {
   }
 
   /**
-   * Collection holding the [[gr.grnet.aquarium.logic.events.ResourceEvent]]s.
+   * Collection holding the [[gr.grnet.aquarium.events.ResourceEvent]]s.
    *
    * Resource events are coming from all systems handling billable resources.
    */
@@ -370,14 +367,14 @@ object MongoDBStore {
   final val USER_STATES_COLLECTION = "userstates"
 
   /**
-   * Collection holding [[gr.grnet.aquarium.logic.events.UserEvent]]s.
+   * Collection holding [[gr.grnet.aquarium.events.UserEvent]]s.
    *
    * User events are coming from the IM module (external).
    */
   final val USER_EVENTS_COLLECTION = "userevents"
 
   /**
-   * Collection holding [[gr.grnet.aquarium.logic.events.UserEvent]]s that could not be parsed to normal objects.
+   * Collection holding [[gr.grnet.aquarium.events.UserEvent]]s that could not be parsed to normal objects.
    *
    * We of course assume at least a valid JSON representation.
    *
@@ -386,7 +383,7 @@ object MongoDBStore {
   final val UNPARSED_USER_EVENTS_COLLECTION = "unparsed_userevents"
 
   /**
-   * Collection holding [[gr.grnet.aquarium.logic.events.WalletEntry]].
+   * Collection holding [[gr.grnet.aquarium.events.WalletEntry]].
    *
    * Wallet entries are generated internally in Aquarium.
    */
@@ -398,7 +395,7 @@ object MongoDBStore {
 //  final val POLICIES_COLLECTION = "policies"
 
   /**
-   * Collection holding [[gr.grnet.aquarium.logic.events.PolicyEntry]].
+   * Collection holding [[gr.grnet.aquarium.events.PolicyEntry]].
    */
   final val POLICY_ENTRIES_COLLECTION = "policyEntries"
 

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
index 642fc25..bfe7495 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
@@ -39,9 +39,9 @@ package user
 import gr.grnet.aquarium.util.{findFromMapAsMaybe, findAndRemoveFromMap, shortClassNameOf}
 import gr.grnet.aquarium.logic.accounting.Policy
 import java.util.Date
-import com.ckkloverdos.maybe.{Failed, NoVal, Maybe, Just}
-import logic.events.ResourceEvent
-import logic.events.ResourceEvent.FullMutableResourceTypeMap
+import com.ckkloverdos.maybe.{NoVal, Maybe, Just}
+import gr.grnet.aquarium.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent.FullMutableResourceTypeMap
 import logic.accounting.dsl.{Timeslot, DSLAgreement}
 import collection.immutable.{TreeMap, SortedMap}
 import util.date.MutableDateCalc
@@ -132,11 +132,11 @@ case class AgreementSnapshot(agreements: List[Agreement], snapshotTime: Long) ex
  *  - If the resource is complex, the (name, instanceId) is (DSLResource.name, instance-id)
  *  - If the resource is simple,  the (name, instanceId) is (DSLResource.name, "1")
  *
- * @param resource        Same as `resource` of [[gr.grnet.aquarium.logic.events.ResourceEvent]]
- * @param instanceId      Same as `instanceId` of [[gr.grnet.aquarium.logic.events.ResourceEvent]]
+ * @param resource        Same as `resource` of [[gr.grnet.aquarium.events.ResourceEvent]]
+ * @param instanceId      Same as `instanceId` of [[gr.grnet.aquarium.events.ResourceEvent]]
  * @param instanceAmount  This is the amount kept for the resource instance.
 *                         The general rule is that an amount saved in a [[gr.grnet.aquarium.user.ResourceInstanceSnapshot]]
- *                        represents a total value, while a value appearing in a [[gr.grnet.aquarium.logic.events.ResourceEvent]]
+ *                        represents a total value, while a value appearing in a [[gr.grnet.aquarium.events.ResourceEvent]]
  *                        represents a difference. How these two values are combined to form the new amount is dictated
  *                        by the underlying [[gr.grnet.aquarium.logic.accounting.dsl.DSLCostPolicy]]
  * @param snapshotTime

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserState.scala b/src/main/scala/gr/grnet/aquarium/user/UserState.scala
index be714d9..0a5140c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserState.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserState.scala
@@ -40,8 +40,7 @@ import net.liftweb.json.{JsonAST, Xml}
 import gr.grnet.aquarium.logic.accounting.dsl.DSLAgreement
 import com.ckkloverdos.maybe.{Failed, Maybe}
 import gr.grnet.aquarium.util.date.MutableDateCalc
-import gr.grnet.aquarium.store.RecordID
-import gr.grnet.aquarium.logic.events.{NewWalletEntry, UserEvent, WalletEntry}
+import gr.grnet.aquarium.events.{UserEvent, NewWalletEntry, WalletEntry}
 
 
 /**

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
index 1587c03..2056e17 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
@@ -39,13 +39,13 @@ package gr.grnet.aquarium.user
 import scala.collection.mutable
 import com.ckkloverdos.maybe.{Failed, NoVal, Just, Maybe}
 import gr.grnet.aquarium.util.{ContextualLogger, Loggable, justForSure, failedForSure}
-import gr.grnet.aquarium.logic.events.{NewWalletEntry, ResourceEvent}
 import gr.grnet.aquarium.util.date.{TimeHelpers, MutableDateCalc}
 import gr.grnet.aquarium.logic.accounting.dsl.{DSLAgreement, DSLResourcesMap}
 import gr.grnet.aquarium.store.{StoreProvider, PolicyStore}
 import gr.grnet.aquarium.logic.accounting.Accounting
 import gr.grnet.aquarium.logic.accounting.algorithm.CostPolicyAlgorithmCompiler
 import gr.grnet.aquarium.AquariumException
+import gr.grnet.aquarium.events.{NewWalletEntry, ResourceEvent}
 
 /**
  *

diff --git a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
index 1ecd015..aeda19c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
@@ -37,7 +37,7 @@ package gr.grnet.aquarium.util
 
 import akka.amqp._
 import util.Random
-import gr.grnet.aquarium.logic.events.{UserEvent, ResourceEvent}
+import gr.grnet.aquarium.events.{UserEvent, ResourceEvent}
 import scopt.OptionParser
 import gr.grnet.aquarium.messaging.AkkaAMQP
 import java.lang.StringBuffer

diff --git a/src/main/scala/gr/grnet/aquarium/util/json/JsonHelpers.scala b/src/main/scala/gr/grnet/aquarium/util/json/JsonHelpers.scala
index 303b749..aee9e75 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/json/JsonHelpers.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/json/JsonHelpers.scala
@@ -36,10 +36,9 @@
 package gr.grnet.aquarium.util.json
 
 import net.liftweb.json.ext.JodaTimeSerializers
-import gr.grnet.aquarium.logic.events.AquariumEvent
 import net.liftweb.json.JsonAST.JValue
 import net.liftweb.json._
-import gr.grnet.aquarium.logic.accounting.dsl._
+import gr.grnet.aquarium.events.AquariumEvent
 
 /**
  * Provides conversion methods from and to JSON.

diff --git a/src/test/scala/gr/grnet/aquarium/converter/ConverterTest.scala b/src/test/scala/gr/grnet/aquarium/converter/ConverterTest.scala
new file mode 100644 (file)
index 0000000..d23e907
--- /dev/null
+++ b/src/test/scala/gr/grnet/aquarium/converter/ConverterTest.scala
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ */
+
+package gr.grnet.aquarium.converter
+
+import org.junit.Test
+import gr.grnet.aquarium.util.json.JsonHelpers
+import java.util.Date
+
+/**
+ *
+ * @author Christos KK Loverdos <loverdos@gmail.com>
+ */
+
+case class Foo(aDouble: Double, aDate: Date, map: Map[Int, Int])
+
+class ConverterTest {
+//  @Test
+//  def testJSONMapConversion: Unit = {
+//    val foo = Foo(1.0, new Date(), Map(1 -> 1, 2 -> 2, 3 -> 3))
+//    val json = JsonHelpers.anyToJson(foo)
+//  }
+}

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/AccountingTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/AccountingTest.scala
index fdceba6..9a293b6 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/AccountingTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/AccountingTest.scala
@@ -41,7 +41,7 @@ import gr.grnet.aquarium.logic.accounting.dsl.Timeslot
 import java.util.Date
 import junit.framework.Assert._
 import gr.grnet.aquarium.logic.accounting.{Accounting}
-import gr.grnet.aquarium.logic.events.{WalletEntry, ResourceEvent}
+import gr.grnet.aquarium.events.{WalletEntry, ResourceEvent}
 import com.ckkloverdos.maybe.Just
 
 /**

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala b/src/test/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala
similarity index 100%
rename from src/main/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala
rename to src/test/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala b/src/test/scala/gr/grnet/aquarium/processor/actor/Constants.scala
similarity index 96%
rename from src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala
rename to src/test/scala/gr/grnet/aquarium/processor/actor/Constants.scala
index c099c10..1363afa 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala
+++ b/src/test/scala/gr/grnet/aquarium/processor/actor/Constants.scala
@@ -36,14 +36,14 @@
 package gr.grnet.aquarium.processor.actor
 
 /**
- * 
+ *
  * @author Christos KK Loverdos <loverdos@gmail.com>.
  */
 object Constants {
   val RemoteHost = "localhost"
   val RemotePort = 2552
-  val LocalHost  = "localhost"
-  val LocalPort  = 2551
+  val LocalHost = "localhost"
+  val LocalPort = 2551
   val ActorNameEcho = "echo"
   val ActorNameSilent = "silent"
 }

diff --git a/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala b/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
index 0dc28d2..d6ac35f 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
@@ -39,7 +39,7 @@ import org.junit.Assert._
 import org.junit.Assume._
 import gr.grnet.aquarium.Configurator._
 import gr.grnet.aquarium.util.{RandomEventGenerator, TestMethods}
-import gr.grnet.aquarium.logic.events.ResourceEvent
+import gr.grnet.aquarium.events.ResourceEvent
 import collection.mutable.ArrayBuffer
 import org.junit.{After, Test, Before}
 import gr.grnet.aquarium.{StoreConfigurator, LogicTestsAssumptions}