From aac593d667ff69e3f9375dd8872f7f7c779b321b Mon Sep 17 00:00:00 2001 From: Christos KK Loverdos Date: Tue, 24 Apr 2012 11:53:04 +0300 Subject: [PATCH] Rename package and make-dist with maven offline mode --- make-dev-dist.sh | 2 +- make-dist.sh | 17 +++++++++++++---- make-local-dist.sh | 2 +- .../scala/gr/grnet/aquarium/Configurator.scala | 4 ++-- .../service/dispatcher/DispatcherMessage.scala | 4 ++-- .../aquarium/actor/service/user/UserActor.scala | 4 ++-- .../grnet/aquarium/converter/JsonConversions.scala | 2 +- .../{events => event}/AquariumEventModel.scala | 2 +- .../{events => event}/AquariumEventSkeleton.scala | 2 +- .../{events => event}/NewWalletEntry.scala | 2 +- .../aquarium/{events => event}/PolicyEntry.scala | 2 +- .../aquarium/{events => event}/ResourceEvent.scala | 2 +- .../aquarium/{events => event}/WalletEntry.scala | 2 +- .../aquarium/{events => event}/im/IMEvent.scala | 2 +- .../{events => event}/im/IMEventModel.scala | 6 ++++-- .../aquarium/{events => event}/im/StdIMEvent.scala | 4 ++-- .../aquarium/logic/accounting/Accounting.scala | 2 +- .../logic/accounting/dsl/DSLCostPolicy.scala | 4 ++-- .../aquarium/logic/accounting/dsl/DSLPolicy.scala | 2 +- .../aquarium/service/EventProcessorService.scala | 2 +- .../aquarium/service/IMEventProcessorService.scala | 2 +- .../service/ResourceEventProcessorService.scala | 2 +- .../aquarium/simulation/ResourceInstanceSim.scala | 2 +- .../simulation/StdBandwidthInstanceSim.scala | 2 +- .../simulation/StdDiskspaceInstanceSim.scala | 2 +- .../aquarium/simulation/StdVMTimeInstanceSim.scala | 2 +- .../gr/grnet/aquarium/simulation/UserSim.scala | 2 +- .../gr/grnet/aquarium/store/IMEventStore.scala | 2 +- .../grnet/aquarium/store/LocalFSEventStore.scala | 4 ++-- .../gr/grnet/aquarium/store/PolicyStore.scala | 2 +- .../grnet/aquarium/store/ResourceEventStore.scala | 2 +- .../gr/grnet/aquarium/store/WalletEntryStore.scala | 2 +- .../gr/grnet/aquarium/store/memory/MemStore.scala | 4 ++-- .../gr/grnet/aquarium/store/memory/package.scala | 2 +- .../aquarium/store/mongodb/MongoDBIMEvent.scala | 2 +- .../aquarium/store/mongodb/MongoDBStore.scala | 20 ++++++++++---------- .../gr/grnet/aquarium/user/UserDataSnapshot.scala | 10 +++++----- .../scala/gr/grnet/aquarium/user/UserState.scala | 4 ++-- .../aquarium/user/UserStateComputations.scala | 2 +- .../grnet/aquarium/util/RandomEventGenerator.scala | 4 ++-- .../grnet/aquarium/logic/test/AccountingTest.scala | 2 +- .../aquarium/store/mongodb/EventStoreTest.scala | 2 +- 42 files changed, 79 insertions(+), 68 deletions(-) rename src/main/scala/gr/grnet/aquarium/{events => event}/AquariumEventModel.scala (98%) rename src/main/scala/gr/grnet/aquarium/{events => event}/AquariumEventSkeleton.scala (99%) rename src/main/scala/gr/grnet/aquarium/{events => event}/NewWalletEntry.scala (99%) rename src/main/scala/gr/grnet/aquarium/{events => event}/PolicyEntry.scala (99%) rename src/main/scala/gr/grnet/aquarium/{events => event}/ResourceEvent.scala (99%) rename src/main/scala/gr/grnet/aquarium/{events => event}/WalletEntry.scala (99%) rename src/main/scala/gr/grnet/aquarium/{events => event}/im/IMEvent.scala (99%) rename src/main/scala/gr/grnet/aquarium/{events => event}/im/IMEventModel.scala (93%) rename src/main/scala/gr/grnet/aquarium/{events => event}/im/StdIMEvent.scala (96%) diff --git a/make-dev-dist.sh b/make-dev-dist.sh index 9424092..d748b63 100755 --- a/make-dev-dist.sh +++ b/make-dev-dist.sh @@ -1,3 +1,3 @@ #!/bin/sh -./make-dist.sh -c dev.aquarium.properties -v -k -b fast -a aquarium-dist +./make-dist.sh -c dev.aquarium.properties -v -k -b fast -a aquarium-dist "$@" diff --git a/make-dist.sh b/make-dist.sh index a80fd4b..b3e28ea 100755 --- a/make-dist.sh +++ b/make-dist.sh @@ -49,6 +49,8 @@ P_BUILD="normal" P_KEEPDIST="no" P_FAKEIT="no" P_ARCHIVE="" +P_OFFLINE="no" +MVN_OPTS="" verbose() { if [ "$P_VERBOSE" = "yes" ]; then @@ -62,6 +64,7 @@ verbose_p() { verbose "Keep dist/ folder :" $P_KEEPDIST verbose "Custom achive name :" $P_ARCHIVE verbose "Fake it :" $P_FAKEIT + verbose "maven offline mode :" $P_OFFLINE } fail() { @@ -101,7 +104,8 @@ clean() { echo "=== mvn clean =================" echo "===============================" echo - mvn clean || fail "cleaning compilation artifacts" + echo mvn ${MVN_OPTS} clean + mvn ${MVN_OPTS} clean || fail "cleaning compilation artifacts" echo elif [ "$P_BUILD"="fast" ]; then echo @@ -114,7 +118,8 @@ clean() { collectdeps() { if [ "$P_BUILD" = "normal" ]; then - mvn dependency:copy-dependencies + echo mvn ${MVN_OPTS} dependency:copy-dependencies + mvn ${MVN_OPTS} dependency:copy-dependencies fi cp target/dependency/*.jar $DIST/lib || fail "collecting dependencies" @@ -126,7 +131,8 @@ build() { echo "=== mvn package ===============" echo "===============================" echo - mvn package -DskipTests && { + echo mvn ${MVN_OPTS} package -DskipTests + mvn ${MVN_OPTS} package -DskipTests && { echo echo "Copying Aquarium classes" aquariumjar=`find target -type f|egrep "aquarium-[0-9\.]+(-SNAPSHOT)?\.jar"` @@ -192,12 +198,13 @@ usage() { echo " -k Keep generated dist folder." echo " -h Show this message." echo " -n As in make -n." + echo " -o Use mvn in offline mode (--offline, -o)" echo " -v Be verbose." exit 0 } -while getopts ":a:b:hkc:nv" opt +while getopts ":a:b:hkc:nov" opt do case $opt in a) P_ARCHIVE=$OPTARG @@ -212,6 +219,8 @@ do ;; n) P_FAKEIT="yes" ;; + o) P_OFFLINE="yes"; MVN_OPTS="-o" + ;; v) P_VERBOSE="yes" ;; :) ERROR="Option -$OPTARG requires an argument. Aborting..." diff --git a/make-local-dist.sh b/make-local-dist.sh index 70f1b7d..8fd92b9 100755 --- a/make-local-dist.sh +++ b/make-local-dist.sh @@ -1,3 +1,3 @@ #!/bin/sh -./make-dist.sh -c local.aquarium.properties -v -k -b fast -a aquarium-dist +./make-dist.sh -c local.aquarium.properties -v -k -b fast -a aquarium-dist "$@" diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala index 8811a9f..ca6273b 100644 --- a/src/main/scala/gr/grnet/aquarium/Configurator.scala +++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala @@ -35,7 +35,7 @@ package gr.grnet.aquarium -import events.im.IMEventModel +import event.im.IMEventModel import java.io.File import com.ckkloverdos.maybe._ @@ -536,7 +536,7 @@ object Configurator { final val events_store_folder = "events.store.folder" /** - * If set to `true`, then an IM event that cannot be parsed to [[gr.grnet.aquarium.events.im.IMEventModel]] is + * If set to `true`, then an IM event that cannot be parsed to [[gr.grnet.aquarium.event.im.IMEventModel]] is * saved to the [[gr.grnet.aquarium.store.IMEventStore]]. */ final val save_unparsed_event_im = "save.unparsed.event.im" 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 091c78a..bfc10c7 100644 --- 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 @@ -39,8 +39,8 @@ package dispatcher import gr.grnet.aquarium.user.UserState import gr.grnet.aquarium.util.json.JsonSupport -import gr.grnet.aquarium.events.im.IMEventModel -import gr.grnet.aquarium.events.ResourceEvent +import gr.grnet.aquarium.event.im.IMEventModel +import gr.grnet.aquarium.event.ResourceEvent import gr.grnet.aquarium.converter.{PrettyJsonTextFormat, StdConverters} 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 9a130ce..90be550 100644 --- a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala +++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala @@ -51,8 +51,8 @@ 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.im.IMEventModel -import gr.grnet.aquarium.events.{WalletEntry} +import gr.grnet.aquarium.event.im.IMEventModel +import gr.grnet.aquarium.event.{WalletEntry} /** diff --git a/src/main/scala/gr/grnet/aquarium/converter/JsonConversions.scala b/src/main/scala/gr/grnet/aquarium/converter/JsonConversions.scala index e592644..acc3e5d 100644 --- a/src/main/scala/gr/grnet/aquarium/converter/JsonConversions.scala +++ b/src/main/scala/gr/grnet/aquarium/converter/JsonConversions.scala @@ -38,7 +38,7 @@ package gr.grnet.aquarium.converter import net.liftweb.json.JsonAST.JValue import net.liftweb.json._ import ext.JodaTimeSerializers -import gr.grnet.aquarium.events.AquariumEventSkeleton +import gr.grnet.aquarium.event.AquariumEventSkeleton /** diff --git a/src/main/scala/gr/grnet/aquarium/events/AquariumEventModel.scala b/src/main/scala/gr/grnet/aquarium/event/AquariumEventModel.scala similarity index 98% rename from src/main/scala/gr/grnet/aquarium/events/AquariumEventModel.scala rename to src/main/scala/gr/grnet/aquarium/event/AquariumEventModel.scala index e6a322f..e4f23da 100644 --- a/src/main/scala/gr/grnet/aquarium/events/AquariumEventModel.scala +++ b/src/main/scala/gr/grnet/aquarium/event/AquariumEventModel.scala @@ -33,7 +33,7 @@ * or implied, of GRNET S.A. */ -package gr.grnet.aquarium.events +package gr.grnet.aquarium.event import gr.grnet.aquarium.util.json.JsonSupport diff --git a/src/main/scala/gr/grnet/aquarium/events/AquariumEventSkeleton.scala b/src/main/scala/gr/grnet/aquarium/event/AquariumEventSkeleton.scala similarity index 99% rename from src/main/scala/gr/grnet/aquarium/events/AquariumEventSkeleton.scala rename to src/main/scala/gr/grnet/aquarium/event/AquariumEventSkeleton.scala index 785f4b0..e429cf8 100644 --- a/src/main/scala/gr/grnet/aquarium/events/AquariumEventSkeleton.scala +++ b/src/main/scala/gr/grnet/aquarium/event/AquariumEventSkeleton.scala @@ -34,7 +34,7 @@ */ package gr.grnet.aquarium -package events +package event import util.xml.XmlSupport diff --git a/src/main/scala/gr/grnet/aquarium/events/NewWalletEntry.scala b/src/main/scala/gr/grnet/aquarium/event/NewWalletEntry.scala similarity index 99% rename from src/main/scala/gr/grnet/aquarium/events/NewWalletEntry.scala rename to src/main/scala/gr/grnet/aquarium/event/NewWalletEntry.scala index 31bf3d4..e29e55f 100644 --- a/src/main/scala/gr/grnet/aquarium/events/NewWalletEntry.scala +++ b/src/main/scala/gr/grnet/aquarium/event/NewWalletEntry.scala @@ -34,7 +34,7 @@ */ package gr.grnet.aquarium -package events +package event import gr.grnet.aquarium.logic.accounting.Chargeslot import gr.grnet.aquarium.util.date.MutableDateCalc diff --git a/src/main/scala/gr/grnet/aquarium/events/PolicyEntry.scala b/src/main/scala/gr/grnet/aquarium/event/PolicyEntry.scala similarity index 99% rename from src/main/scala/gr/grnet/aquarium/events/PolicyEntry.scala rename to src/main/scala/gr/grnet/aquarium/event/PolicyEntry.scala index 1340aeb..a2de6e9 100644 --- a/src/main/scala/gr/grnet/aquarium/events/PolicyEntry.scala +++ b/src/main/scala/gr/grnet/aquarium/event/PolicyEntry.scala @@ -34,7 +34,7 @@ */ package gr.grnet.aquarium -package events +package event import gr.grnet.aquarium.logic.accounting.dsl.Timeslot import java.util.Date diff --git a/src/main/scala/gr/grnet/aquarium/events/ResourceEvent.scala b/src/main/scala/gr/grnet/aquarium/event/ResourceEvent.scala similarity index 99% rename from src/main/scala/gr/grnet/aquarium/events/ResourceEvent.scala rename to src/main/scala/gr/grnet/aquarium/event/ResourceEvent.scala index a0f542c..21ea02b 100644 --- a/src/main/scala/gr/grnet/aquarium/events/ResourceEvent.scala +++ b/src/main/scala/gr/grnet/aquarium/event/ResourceEvent.scala @@ -34,7 +34,7 @@ */ package gr.grnet.aquarium -package events +package event import gr.grnet.aquarium.util.makeString import gr.grnet.aquarium.logic.accounting.dsl._ diff --git a/src/main/scala/gr/grnet/aquarium/events/WalletEntry.scala b/src/main/scala/gr/grnet/aquarium/event/WalletEntry.scala similarity index 99% rename from src/main/scala/gr/grnet/aquarium/events/WalletEntry.scala rename to src/main/scala/gr/grnet/aquarium/event/WalletEntry.scala index fbaff9d..298b484 100644 --- a/src/main/scala/gr/grnet/aquarium/events/WalletEntry.scala +++ b/src/main/scala/gr/grnet/aquarium/event/WalletEntry.scala @@ -34,7 +34,7 @@ */ package gr.grnet.aquarium -package events +package event import java.util.Date import converter.{JsonTextFormat, StdConverters} diff --git a/src/main/scala/gr/grnet/aquarium/events/im/IMEvent.scala b/src/main/scala/gr/grnet/aquarium/event/im/IMEvent.scala similarity index 99% rename from src/main/scala/gr/grnet/aquarium/events/im/IMEvent.scala rename to src/main/scala/gr/grnet/aquarium/event/im/IMEvent.scala index 8708734..1030a19 100644 --- a/src/main/scala/gr/grnet/aquarium/events/im/IMEvent.scala +++ b/src/main/scala/gr/grnet/aquarium/event/im/IMEvent.scala @@ -34,7 +34,7 @@ */ package gr.grnet.aquarium -package events +package event package im import gr.grnet.aquarium.util.makeString diff --git a/src/main/scala/gr/grnet/aquarium/events/im/IMEventModel.scala b/src/main/scala/gr/grnet/aquarium/event/im/IMEventModel.scala similarity index 93% rename from src/main/scala/gr/grnet/aquarium/events/im/IMEventModel.scala rename to src/main/scala/gr/grnet/aquarium/event/im/IMEventModel.scala index 0a09dbd..43a88d8 100644 --- a/src/main/scala/gr/grnet/aquarium/events/im/IMEventModel.scala +++ b/src/main/scala/gr/grnet/aquarium/event/im/IMEventModel.scala @@ -33,13 +33,15 @@ * or implied, of GRNET S.A. */ -package gr.grnet.aquarium.events.im +package gr.grnet.aquarium.event.im -import gr.grnet.aquarium.events.AquariumEventModel +import gr.grnet.aquarium.event.AquariumEventModel /** * The model of any event sent from the `Identity Management` (IM) external system. * + * By definition, this is the model agreed upon between Aquarium and IM. + * * @author Christos KK Loverdos */ diff --git a/src/main/scala/gr/grnet/aquarium/events/im/StdIMEvent.scala b/src/main/scala/gr/grnet/aquarium/event/im/StdIMEvent.scala similarity index 96% rename from src/main/scala/gr/grnet/aquarium/events/im/StdIMEvent.scala rename to src/main/scala/gr/grnet/aquarium/event/im/StdIMEvent.scala index aee0463..5ce158e 100644 --- a/src/main/scala/gr/grnet/aquarium/events/im/StdIMEvent.scala +++ b/src/main/scala/gr/grnet/aquarium/event/im/StdIMEvent.scala @@ -33,9 +33,9 @@ * or implied, of GRNET S.A. */ -package gr.grnet.aquarium.events.im +package gr.grnet.aquarium.event.im -import gr.grnet.aquarium.events.AquariumEventSkeleton +import gr.grnet.aquarium.event.AquariumEventSkeleton /** * 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 01535a5..ed42c34 100644 --- a/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala +++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala @@ -44,7 +44,7 @@ import com.ckkloverdos.maybe.{NoVal, Maybe, Failed, Just} 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} +import gr.grnet.aquarium.event.{WalletEntry, ResourceEvent} import gr.grnet.aquarium.util.date.{TimeHelpers, MutableDateCalc} /** 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 9ff7daf..c193466 100644 --- 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.events.ResourceEvent +import gr.grnet.aquarium.event.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.events.ResourceEvent]] + * @param newEventValue the value contained in a newly arrived [[gr.grnet.aquarium.event.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 ac3322e..2ae73f6 100644 --- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPolicy.scala +++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPolicy.scala @@ -37,7 +37,7 @@ package gr.grnet.aquarium.logic.accounting.dsl import gr.grnet.aquarium.util.CryptoUtils import gr.grnet.aquarium.util.date.TimeHelpers -import gr.grnet.aquarium.events.PolicyEntry +import gr.grnet.aquarium.event.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 e73be00..33b68da 100644 --- a/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala +++ b/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala @@ -52,7 +52,7 @@ import com.ckkloverdos.maybe._ import gr.grnet.aquarium.util.date.TimeHelpers import gr.grnet.aquarium.{AquariumException, Configurator} import gr.grnet.aquarium.store.RecordID -import gr.grnet.aquarium.events.{AquariumEventModel, AquariumEventSkeleton} +import gr.grnet.aquarium.event.{AquariumEventModel, AquariumEventSkeleton} /** * An abstract service that retrieves Aquarium events from a queue, diff --git a/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala index 07ef78c..34a0070 100644 --- a/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala +++ b/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala @@ -44,7 +44,7 @@ import gr.grnet.aquarium.actor.message.service.dispatcher.ProcessIMEvent import gr.grnet.aquarium.util.date.TimeHelpers import gr.grnet.aquarium.util.{LogHelpers, makeString} import com.ckkloverdos.maybe._ -import gr.grnet.aquarium.events.im.IMEventModel +import gr.grnet.aquarium.event.im.IMEventModel import gr.grnet.aquarium.store.memory.MemStore /** diff --git a/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala index de89d40..782bdc1 100644 --- a/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala +++ b/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala @@ -40,7 +40,7 @@ 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 +import gr.grnet.aquarium.event.ResourceEvent import gr.grnet.aquarium.util.date.TimeHelpers diff --git a/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala index 3866765..9da57bb 100644 --- a/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala +++ b/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala @@ -35,7 +35,7 @@ package gr.grnet.aquarium.simulation -import gr.grnet.aquarium.events.ResourceEvent +import gr.grnet.aquarium.event.ResourceEvent /** diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala index b7be463..532c22d 100644 --- 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.events.ResourceEvent +import gr.grnet.aquarium.event.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 5b62d5f..55c8555 100644 --- 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.events.ResourceEvent +import gr.grnet.aquarium.event.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 1295d19..c69a30c 100644 --- 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.events.ResourceEvent +import gr.grnet.aquarium.event.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 c9bd4ef..6cfdb48 100644 --- a/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala +++ b/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala @@ -37,7 +37,7 @@ package gr.grnet.aquarium.simulation import java.util.Date import gr.grnet.aquarium.store.RecordID import math.Ordering -import gr.grnet.aquarium.events.ResourceEvent +import gr.grnet.aquarium.event.ResourceEvent /** * A simulator for a user. diff --git a/src/main/scala/gr/grnet/aquarium/store/IMEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/IMEventStore.scala index 1624a95..533e58e 100644 --- a/src/main/scala/gr/grnet/aquarium/store/IMEventStore.scala +++ b/src/main/scala/gr/grnet/aquarium/store/IMEventStore.scala @@ -36,7 +36,7 @@ package gr.grnet.aquarium.store import com.ckkloverdos.maybe.Maybe -import gr.grnet.aquarium.events.im.IMEventModel +import gr.grnet.aquarium.event.im.IMEventModel import gr.grnet.aquarium.util.makeString /** diff --git a/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala index ab17152..e47040a 100644 --- a/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala +++ b/src/main/scala/gr/grnet/aquarium/store/LocalFSEventStore.scala @@ -40,8 +40,8 @@ import java.io.{FileOutputStream, File} import gr.grnet.aquarium.util.{Loggable, stringOfStackTrace} import gr.grnet.aquarium.util.date.{TimeHelpers, MutableDateCalc} import gr.grnet.aquarium.uid.{EAIOUUIDGenerator, UIDGenerator} -import gr.grnet.aquarium.events.ResourceEvent -import gr.grnet.aquarium.events.im.IMEventModel +import gr.grnet.aquarium.event.ResourceEvent +import gr.grnet.aquarium.event.im.IMEventModel /** * 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 426af84..ed80f65 100644 --- a/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala +++ b/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala @@ -39,7 +39,7 @@ import scala.collection.immutable 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 +import gr.grnet.aquarium.event.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 809d970..2d00e20 100644 --- 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.events.ResourceEvent +import gr.grnet.aquarium.event.ResourceEvent import gr.grnet.aquarium.AquariumException /** diff --git a/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala b/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala index 2c515fe..65aa74d 100644 --- a/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala +++ b/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala @@ -37,7 +37,7 @@ package gr.grnet.aquarium.store import java.util.Date import com.ckkloverdos.maybe.Maybe -import gr.grnet.aquarium.events.WalletEntry +import gr.grnet.aquarium.event.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 9c3a601..0547241 100644 --- a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala +++ b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala @@ -45,10 +45,10 @@ import java.util.concurrent.ConcurrentHashMap import gr.grnet.aquarium.user.UserState import gr.grnet.aquarium.uid.ConcurrentVMLocalUIDGenerator import gr.grnet.aquarium.{AquariumException, Configurable} -import gr.grnet.aquarium.events.{WalletEntry, ResourceEvent, PolicyEntry} +import gr.grnet.aquarium.event.{WalletEntry, ResourceEvent, PolicyEntry} import gr.grnet.aquarium.converter.JsonTextFormat import gr.grnet.aquarium.util._ -import gr.grnet.aquarium.events.im.{StdIMEvent, IMEventModel} +import gr.grnet.aquarium.event.im.{StdIMEvent, IMEventModel} /** * An implementation of various stores that persists data in memory. diff --git a/src/main/scala/gr/grnet/aquarium/store/memory/package.scala b/src/main/scala/gr/grnet/aquarium/store/memory/package.scala index dd30e28..376146d 100644 --- a/src/main/scala/gr/grnet/aquarium/store/memory/package.scala +++ b/src/main/scala/gr/grnet/aquarium/store/memory/package.scala @@ -35,7 +35,7 @@ package gr.grnet.aquarium.store -import gr.grnet.aquarium.events.im.StdIMEvent +import gr.grnet.aquarium.event.im.StdIMEvent package object memory { type MemIMEvent = StdIMEvent diff --git a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBIMEvent.scala b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBIMEvent.scala index b5991c7..1792ca6 100644 --- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBIMEvent.scala +++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBIMEvent.scala @@ -38,7 +38,7 @@ package gr.grnet.aquarium.store.mongodb import org.bson.types.ObjectId import gr.grnet.aquarium.converter.{JsonTextFormat, StdConverters} import gr.grnet.aquarium.util._ -import gr.grnet.aquarium.events.im.{IMEventModel, StdIMEvent} +import gr.grnet.aquarium.event.im.{IMEventModel, StdIMEvent} /** 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 70a25ee..b2dfae4 100644 --- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala +++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala @@ -40,16 +40,16 @@ import gr.grnet.aquarium.user.UserState import gr.grnet.aquarium.user.UserState.{JsonNames => UserStateJsonNames} import gr.grnet.aquarium.util.json.JsonSupport import collection.mutable.ListBuffer -import gr.grnet.aquarium.events.im.IMEventModel.{Names => IMEventNames} +import gr.grnet.aquarium.event.im.IMEventModel.{Names => IMEventNames} import gr.grnet.aquarium.store._ -import gr.grnet.aquarium.events.ResourceEvent.{JsonNames => ResourceJsonNames} -import gr.grnet.aquarium.events.WalletEntry.{JsonNames => WalletJsonNames} -import gr.grnet.aquarium.events.PolicyEntry.{JsonNames => PolicyJsonNames} +import gr.grnet.aquarium.event.ResourceEvent.{JsonNames => ResourceJsonNames} +import gr.grnet.aquarium.event.WalletEntry.{JsonNames => WalletJsonNames} +import gr.grnet.aquarium.event.PolicyEntry.{JsonNames => PolicyJsonNames} import java.util.Date import gr.grnet.aquarium.logic.accounting.Policy import com.mongodb._ import org.bson.types.ObjectId -import gr.grnet.aquarium.events._ +import gr.grnet.aquarium.event._ import com.ckkloverdos.maybe.{NoVal, Maybe} import im.IMEventModel import gr.grnet.aquarium.util._ @@ -388,7 +388,7 @@ object MongoDBStore { } /** - * Collection holding the [[gr.grnet.aquarium.events.ResourceEvent]]s. + * Collection holding the [[gr.grnet.aquarium.event.ResourceEvent]]s. * * Resource events are coming from all systems handling billable resources. */ @@ -402,14 +402,14 @@ object MongoDBStore { final val USER_STATES_COLLECTION = "userstates" /** - * Collection holding [[gr.grnet.aquarium.events.im.IMEventModel]]s. + * Collection holding [[gr.grnet.aquarium.event.im.IMEventModel]]s. * * User events are coming from the IM module (external). */ final val IM_EVENTS_COLLECTION = "imevents" /** - * Collection holding [[gr.grnet.aquarium.events.im.IMEventModel]]s that could not be parsed to normal objects. + * Collection holding [[gr.grnet.aquarium.event.im.IMEventModel]]s that could not be parsed to normal objects. * * We of course assume at least a valid JSON representation. * @@ -418,7 +418,7 @@ object MongoDBStore { final val UNPARSED_IM_EVENTS_COLLECTION = "unparsed_imevents" /** - * Collection holding [[gr.grnet.aquarium.events.WalletEntry]]. + * Collection holding [[gr.grnet.aquarium.event.WalletEntry]]. * * Wallet entries are generated internally in Aquarium. */ @@ -430,7 +430,7 @@ object MongoDBStore { // final val POLICIES_COLLECTION = "policies" /** - * Collection holding [[gr.grnet.aquarium.events.PolicyEntry]]. + * Collection holding [[gr.grnet.aquarium.event.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 bfe7495..8a492b7 100644 --- a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala +++ b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala @@ -40,8 +40,8 @@ import gr.grnet.aquarium.util.{findFromMapAsMaybe, findAndRemoveFromMap, shortCl import gr.grnet.aquarium.logic.accounting.Policy import java.util.Date import com.ckkloverdos.maybe.{NoVal, Maybe, Just} -import gr.grnet.aquarium.events.ResourceEvent -import gr.grnet.aquarium.events.ResourceEvent.FullMutableResourceTypeMap +import gr.grnet.aquarium.event.ResourceEvent +import gr.grnet.aquarium.event.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.events.ResourceEvent]] - * @param instanceId Same as `instanceId` of [[gr.grnet.aquarium.events.ResourceEvent]] + * @param resource Same as `resource` of [[gr.grnet.aquarium.event.ResourceEvent]] + * @param instanceId Same as `instanceId` of [[gr.grnet.aquarium.event.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.events.ResourceEvent]] + * represents a total value, while a value appearing in a [[gr.grnet.aquarium.event.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 51b56f9..c4b52e1 100644 --- a/src/main/scala/gr/grnet/aquarium/user/UserState.scala +++ b/src/main/scala/gr/grnet/aquarium/user/UserState.scala @@ -39,10 +39,10 @@ import gr.grnet.aquarium.util.json.JsonSupport 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.events.{NewWalletEntry, WalletEntry} +import gr.grnet.aquarium.event.{NewWalletEntry, WalletEntry} import gr.grnet.aquarium.converter.{JsonTextFormat, StdConverters} import gr.grnet.aquarium.AquariumException -import gr.grnet.aquarium.events.im.IMEventModel +import gr.grnet.aquarium.event.im.IMEventModel /** diff --git a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala index 02cc0ca..e909e12 100644 --- a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala +++ b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala @@ -45,7 +45,7 @@ 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} +import gr.grnet.aquarium.event.{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 005cd2d..05de573 100644 --- a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala +++ b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala @@ -37,13 +37,13 @@ package gr.grnet.aquarium.util import akka.amqp._ import util.Random -import gr.grnet.aquarium.events.ResourceEvent +import gr.grnet.aquarium.event.ResourceEvent import scopt.OptionParser import gr.grnet.aquarium.messaging.AkkaAMQP import java.lang.StringBuffer import gr.grnet.aquarium.logic.accounting.Policy import gr.grnet.aquarium.store.memory.MemIMEvent -import gr.grnet.aquarium.events.im.{StdIMEvent, IMEventModel} +import gr.grnet.aquarium.event.im.{StdIMEvent, IMEventModel} /** * Generates random resource events to use as input for testing and 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 9a293b6..eb6932d 100644 --- 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.events.{WalletEntry, ResourceEvent} +import gr.grnet.aquarium.event.{WalletEntry, ResourceEvent} import com.ckkloverdos.maybe.Just /** 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 bce8438..df4d516 100644 --- 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.events.ResourceEvent +import gr.grnet.aquarium.event.ResourceEvent import collection.mutable.ArrayBuffer import org.junit.{After, Test, Before} import gr.grnet.aquarium.{StoreConfigurator, LogicTestsAssumptions} -- 1.7.10.4