Copyright

diff --git a/make-dist.sh b/make-dist.sh
index 3e286fc..abccb6d 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,5 +1,34 @@
 #!/usr/bin/env bash
 
+# Copyright 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 THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS 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.
+
 # Make an Aquarium binary distribution out of current working directory.
 # Use at your own risk (i.e. make sure it compiles etc).
 

diff --git a/src/main/scala/gr/grnet/aquarium/Configurable.scala b/src/main/scala/gr/grnet/aquarium/Configurable.scala
index a5042a7..74d8f9e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurable.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurable.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index d2b6e61..754566a 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/DataSnapshot.scala b/src/main/scala/gr/grnet/aquarium/DataSnapshot.scala
index 85075ce..a41f19c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/DataSnapshot.scala
+++ b/src/main/scala/gr/grnet/aquarium/DataSnapshot.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/Main.scala b/src/main/scala/gr/grnet/aquarium/Main.scala
index 56e2ecb..2f7cc4c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Main.scala
+++ b/src/main/scala/gr/grnet/aquarium/Main.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
index e4c407c..f82ad4e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
+++ b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/ActorConfigurationMessage.scala b/src/main/scala/gr/grnet/aquarium/actor/ActorConfigurationMessage.scala
index a9da93c..ccdff73 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/ActorConfigurationMessage.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/ActorConfigurationMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/ActorMessage.scala b/src/main/scala/gr/grnet/aquarium/actor/ActorMessage.scala
index 9a5f227..1fc8c87 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/ActorMessage.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/ActorMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/ActorProvider.scala b/src/main/scala/gr/grnet/aquarium/actor/ActorProvider.scala
index 794f6f3..047d7d8 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/ActorProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/ActorProvider.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/ActorProviderConfigured.scala b/src/main/scala/gr/grnet/aquarium/actor/ActorProviderConfigured.scala
index 2323a69..7338384 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/ActorProviderConfigured.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/ActorProviderConfigured.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/ActorRole.scala b/src/main/scala/gr/grnet/aquarium/actor/ActorRole.scala
index a748e65..8dd044e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/ActorRole.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/ActorRole.scala
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/AquariumActor.scala b/src/main/scala/gr/grnet/aquarium/actor/AquariumActor.scala
index c8e70b9..bb28ac3 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/AquariumActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/AquariumActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/actor/AquariumPropertiesLoaded.scala b/src/main/scala/gr/grnet/aquarium/actor/AquariumPropertiesLoaded.scala
index 7497f81..ddbb205 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/AquariumPropertiesLoaded.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/AquariumPropertiesLoaded.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.actor
 
 import com.ckkloverdos.props.Props

diff --git a/src/main/scala/gr/grnet/aquarium/actor/SimpleLocalActorProvider.scala b/src/main/scala/gr/grnet/aquarium/actor/SimpleLocalActorProvider.scala
index 143abf3..a234bfa 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/SimpleLocalActorProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/SimpleLocalActorProvider.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

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 0a0255c..38d0e6b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/Policy.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/Policy.scala
index a73e80f..2870f83 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/Policy.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/Policy.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/RoleAgreements.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/RoleAgreements.scala
index 7fa0623..d2eb1c7 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/RoleAgreements.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/RoleAgreements.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/CostPolicyAlgorithmCompiler.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/CostPolicyAlgorithmCompiler.scala
index a01e2f8..3685335 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/CostPolicyAlgorithmCompiler.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/CostPolicyAlgorithmCompiler.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/ExecutableCostPolicyAlgorithm.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/ExecutableCostPolicyAlgorithm.scala
index 59848b5..49dbef2 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/ExecutableCostPolicyAlgorithm.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/ExecutableCostPolicyAlgorithm.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleCostPolicyAlgorithmCompiler.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleCostPolicyAlgorithmCompiler.scala
index 87a32c4..23e8c9f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleCostPolicyAlgorithmCompiler.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleCostPolicyAlgorithmCompiler.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleExecutableCostPolicyAlgorithm.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleExecutableCostPolicyAlgorithm.scala
index 84b6f08..239c608 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleExecutableCostPolicyAlgorithm.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/algorithm/SimpleExecutableCostPolicyAlgorithm.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala
index cc19fdd..43e9774 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAgreement.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAgreement.scala
index 75a01e3..e945377 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAgreement.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAgreement.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala
index 0ce1ab3..67c6a45 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

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 4b849f2..073f4e5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicyVar.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicyVar.scala
index 6e6fb85..0318ff1 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicyVar.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCostPolicyVar.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala
index 40f7102..00d9c9e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLItem.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLItem.scala
index 02c5a9d..629eece 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLItem.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLItem.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.logic.accounting.dsl
 
 import gr.grnet.aquarium.util.yaml.YAMLHelpers

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 c8886aa..7512158 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala
index 30e67ee..9a59a7e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResource.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResource.scala
index 84ee562..119507f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResource.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResource.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResourcesMap.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResourcesMap.scala
index 03a122f..0db71d9 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResourcesMap.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLResourcesMap.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLSemanticChecks.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLSemanticChecks.scala
index f629bc2..bb5389b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLSemanticChecks.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLSemanticChecks.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala
index 5e395c4..910c258 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrame.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrame.scala
index 691bd1b..4f4d2ca 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrame.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrame.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrameRepeat.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrameRepeat.scala
index 44d19df..3495913 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrameRepeat.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeFrameRepeat.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeSpec.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeSpec.scala
index b06fa1c..d13422c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeSpec.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLUtils.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLUtils.scala
index 9ce9a91..e8339fc 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLUtils.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala
index 66e5631..cadec06 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Vocabulary.scala b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Vocabulary.scala
index a61bb90..fa1ec06 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Vocabulary.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Vocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala b/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
index a3510ac..ef8c892 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala b/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
index 19980c0..4ee4d31 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/NewWalletEntry.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala b/src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala
index f6907c8..3108a99 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/PolicyEntry.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala b/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
index 96babd6..80d4e72 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala b/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
index 808549a..df6d9b5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala b/src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala
index be0a4a1..3463075 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/WalletEntry.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/messaging/AkkaAMQP.scala b/src/main/scala/gr/grnet/aquarium/messaging/AkkaAMQP.scala
index 56804c1..14158b5 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/messaging/AkkaAMQP.scala
+++ b/src/main/scala/gr/grnet/aquarium/messaging/AkkaAMQP.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala
index 812d646..abac894 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/ActorProxy.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala
index 0d5b4e6..c099c10 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/Constants.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherActor.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherActor.scala
index 7ded33c..bcbb53e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherMessage.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherMessage.scala
index af6671a..7ed4f3e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherMessage.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/DispatcherMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/EventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/EventProcessorService.scala
index fab0b2c..67398b2 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/EventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/EventProcessorService.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/ReflectiveAquariumActor.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/ReflectiveAquariumActor.scala
index e91f282..28f79e7 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/ReflectiveAquariumActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/ReflectiveAquariumActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceEventProcessorService.scala
index 4393d53..06bec7f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceEventProcessorService.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.processor.actor
 
 import com.ckkloverdos.maybe.{Just, Failed, NoVal}

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceProcessorActor.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceProcessorActor.scala
index 3078fcd..499569c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceProcessorActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/ResourceProcessorActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/processor/actor/UserEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/processor/actor/UserEventProcessorService.scala
index 469e5fa..89c3449 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/processor/actor/UserEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/processor/actor/UserEventProcessorService.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.processor.actor
 
 import gr.grnet.aquarium.logic.events.UserEvent

diff --git a/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActor.scala b/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActor.scala
index 06fcf26..3d847d0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActorService.scala b/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActorService.scala
index b2b90f4..b70297e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/rest/actor/RESTActorService.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/rest/actor/RESTPaths.scala b/src/main/scala/gr/grnet/aquarium/rest/actor/RESTPaths.scala
index 23874c4..a2cf423 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/rest/actor/RESTPaths.scala
+++ b/src/main/scala/gr/grnet/aquarium/rest/actor/RESTPaths.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/AquariumSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/AquariumSim.scala
index 7da83a9..1990d18 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/AquariumSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/AquariumSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/ClientSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/ClientSim.scala
index f7b9fcf..3aa5932 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/ClientSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/ClientSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala
index 6ed28c6..85ba32c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/ResourceInstanceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/ResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/ResourceSim.scala
index 2973b48..9410dbe 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/ResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/ResourceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala
index df9701a..fedf230 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthInstanceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
index 6c9c8c0..05716bb 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdBandwidthResourceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala
index eb3f440..3286032 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceInstanceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
index 3686bc8..a37e634 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdDiskspaceResourceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala
index cbaacd4..f9177d2 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeInstanceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
index f1d7796..3bf6e25 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/StdVMTimeResourceSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala b/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala
index 1983ffb..3b8531b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/UserSim.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/uid/ConcurrentVMLocalUIDGenerator.scala b/src/main/scala/gr/grnet/aquarium/simulation/uid/ConcurrentVMLocalUIDGenerator.scala
index 784106d..2e5416e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/uid/ConcurrentVMLocalUIDGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/uid/ConcurrentVMLocalUIDGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/uid/EAIOUUIDGenerator.scala b/src/main/scala/gr/grnet/aquarium/simulation/uid/EAIOUUIDGenerator.scala
index 2294445..9a1caef 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/uid/EAIOUUIDGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/uid/EAIOUUIDGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/uid/RMIUIDGenerator.scala b/src/main/scala/gr/grnet/aquarium/simulation/uid/RMIUIDGenerator.scala
index bed489f..b627103 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/uid/RMIUIDGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/uid/RMIUIDGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/uid/UIDGenerator.scala b/src/main/scala/gr/grnet/aquarium/simulation/uid/UIDGenerator.scala
index 68b508c..7a27fd1 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/uid/UIDGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/uid/UIDGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/simulation/uid/UUIDGenerator.scala b/src/main/scala/gr/grnet/aquarium/simulation/uid/UUIDGenerator.scala
index 4a2d5ef..69eb126 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/simulation/uid/UUIDGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/simulation/uid/UUIDGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala b/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala
index 5c68c9d..ebf001e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/PolicyStore.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/RecordID.scala b/src/main/scala/gr/grnet/aquarium/store/RecordID.scala
index 0ee1a7f..0a6fe21 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/RecordID.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/RecordID.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
index 7d3401f..17966a8 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/StoreException.scala b/src/main/scala/gr/grnet/aquarium/store/StoreException.scala
index b8000a3..894da4c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/StoreException.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/StoreException.scala
@@ -1,36 +1,36 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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:
+ * 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.
+ *   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.
+ *   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.
+ * 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.
+ * 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.store

diff --git a/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala b/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala
index fd0f5de..4f7396f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/StoreProvider.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala
index 7a9bc1a..20cd289 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/UserEventStore.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.store
 
 import com.ckkloverdos.maybe.Maybe

diff --git a/src/main/scala/gr/grnet/aquarium/store/UserStateStore.scala b/src/main/scala/gr/grnet/aquarium/store/UserStateStore.scala
index 89985e4..b0898dc 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/UserStateStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/UserStateStore.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala b/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala
index 77a825c..856a958 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/WalletEntryStore.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.store
 
 import gr.grnet.aquarium.logic.events.{WalletEntry}

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 43d9d18..a57fc1f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

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 b9223ee..446f0a2 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala
index 44787df..34a3c93 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStoreProvider.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/DefaultUserStateComputations.scala b/src/main/scala/gr/grnet/aquarium/user/DefaultUserStateComputations.scala
index 1445405..8365cc7 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/DefaultUserStateComputations.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/DefaultUserStateComputations.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
index 9fbd070..d1d3681 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserState.scala b/src/main/scala/gr/grnet/aquarium/user/UserState.scala
index 59396f6..be714d9 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserState.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserState.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
index 3401057..6b027c4 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala
index d721b60..1470e0b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorCache.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorCache.scala
index 7ccdf05..284d8fc 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorCache.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorCache.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 GRNET S.A. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  * 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.
+ * or implied, of GRNET S.A.
  */
 package gr.grnet.aquarium.user.actor
 

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala
index bc4330b..7d5bd88 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManager.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManagerMessage.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManagerMessage.scala
index 8443f8f..add8bc8 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManagerMessage.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorManagerMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorMessage.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorMessage.scala
index b08bb66..641a40b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorMessage.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorSupervisor.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorSupervisor.scala
index d6f6321..430aee0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorSupervisor.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorSupervisor.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.user.actor
 
 import akka.actor.Supervisor

diff --git a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorsLRU.scala b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorsLRU.scala
index 0390a2f..5ce1376 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/actor/UserActorsLRU.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/actor/UserActorsLRU.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  * 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.
+ * or implied, of GRNET S.A.
  */
 package gr.grnet.aquarium.user.actor
 

diff --git a/src/main/scala/gr/grnet/aquarium/util/CollectionUtils.scala b/src/main/scala/gr/grnet/aquarium/util/CollectionUtils.scala
index 2d3880a..c2db930 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/CollectionUtils.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/CollectionUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/ConfModel.scala b/src/main/scala/gr/grnet/aquarium/util/ConfModel.scala
index 02630a0..bc07b32 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/ConfModel.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/ConfModel.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/ContextualLogger.scala b/src/main/scala/gr/grnet/aquarium/util/ContextualLogger.scala
index 1c19407..0b4c5b1 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/ContextualLogger.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/ContextualLogger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/CryptoUtils.scala b/src/main/scala/gr/grnet/aquarium/util/CryptoUtils.scala
index 5d9e74f..c7fa43a 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/CryptoUtils.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/CryptoUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/DateUtils.scala b/src/main/scala/gr/grnet/aquarium/util/DateUtils.scala
index 889d9a1..7b141a6 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/DateUtils.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/DateUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/Lifecycle.scala b/src/main/scala/gr/grnet/aquarium/util/Lifecycle.scala
index 4e7b8a9..dec0835 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/Lifecycle.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/Lifecycle.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/LogUtils.scala b/src/main/scala/gr/grnet/aquarium/util/LogUtils.scala
index fac0b2e..d87ed94 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/LogUtils.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/LogUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/Loggable.scala b/src/main/scala/gr/grnet/aquarium/util/Loggable.scala
index 0cc3e18..f036d43 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/Loggable.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/Loggable.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
index b1044c0..756e346 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala b/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala
index 2a293cb..46c8bdb 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.util.date
 
 import java.util.Date

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 94c2d33..f3ceba0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/json/JsonHelpers.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/json/JsonHelpers.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/json/JsonSupport.scala b/src/main/scala/gr/grnet/aquarium/util/json/JsonSupport.scala
index 882938c..a36237d 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/json/JsonSupport.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/json/JsonSupport.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/package.scala b/src/main/scala/gr/grnet/aquarium/util/package.scala
index 5ea3579..47062da 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/package.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/xml/XmlSupport.scala b/src/main/scala/gr/grnet/aquarium/util/xml/XmlSupport.scala
index f1366f0..eb85cd7 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/xml/XmlSupport.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/xml/XmlSupport.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/xstream/ListConverter.scala b/src/main/scala/gr/grnet/aquarium/util/xstream/ListConverter.scala
index 593e514..c72e55f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/xstream/ListConverter.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/xstream/ListConverter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/xstream/XStreamHelpers.scala b/src/main/scala/gr/grnet/aquarium/util/xstream/XStreamHelpers.scala
index 4e0bbb7..b4a3c78 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/xstream/XStreamHelpers.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/xstream/XStreamHelpers.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLBooleanNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLBooleanNode.scala
index 6189f3b..91085e7 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLBooleanNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLBooleanNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLDoubleNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLDoubleNode.scala
index 1a12c9b..c603f31 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLDoubleNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLDoubleNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLEmptyNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLEmptyNode.scala
index c6c6d4c..fd3c198 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLEmptyNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLEmptyNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLHelpers.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLHelpers.scala
index 7e4bd32..63093ec 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLHelpers.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLHelpers.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLIntNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLIntNode.scala
index 1221b56..ba73193 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLIntNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLIntNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLListNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLListNode.scala
index 0d851b4..94131b4 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLListNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLListNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLLongNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLLongNode.scala
index 9565e3c..20dc9b9 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLLongNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLLongNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLMapNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLMapNode.scala
index 479aef5..ea328ef 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLMapNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLMapNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLNode.scala
index 139f417..5158310 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLStringNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLStringNode.scala
index 528409e..3890c8e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLStringNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLStringNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLUnknownNode.scala b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLUnknownNode.scala
index 41b2a35..1f90a8c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLUnknownNode.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/yaml/YAMLUnknownNode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/ConfiguratorTest.scala b/src/test/scala/gr/grnet/aquarium/ConfiguratorTest.scala
index 5a408f8..4696ba6 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/ConfiguratorTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/ConfiguratorTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/LogicTestsAssumptions.scala b/src/test/scala/gr/grnet/aquarium/LogicTestsAssumptions.scala
index 2e55646..042ad03 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/LogicTestsAssumptions.scala
+++ b/src/test/scala/gr/grnet/aquarium/LogicTestsAssumptions.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/PropertyNames.scala b/src/test/scala/gr/grnet/aquarium/PropertyNames.scala
index a239d5d..b816703 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/PropertyNames.scala
+++ b/src/test/scala/gr/grnet/aquarium/PropertyNames.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/StoreConfigurator.scala b/src/test/scala/gr/grnet/aquarium/StoreConfigurator.scala
index 2ff0037..1dd1a90 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/StoreConfigurator.scala
+++ b/src/test/scala/gr/grnet/aquarium/StoreConfigurator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 GRNET S.A. All rights reserved.
+ * 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

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 6ac5b4f..fdceba6 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/AccountingTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/AccountingTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
index 3553125..700a170 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala b/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
index e27864f..41d14f3 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
index 6ecca34..d1ad365 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/DateUtilsTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/DateUtilsTest.scala
index 61b28d6..25da1b9 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/DateUtilsTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/DateUtilsTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/PerfTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/PerfTest.scala
index abe12cd..cffc520 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/PerfTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/PerfTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/PolicyTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/PolicyTest.scala
index 58e0ef0..e83ade5 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/PolicyTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/PolicyTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/RoleAgreementsTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/RoleAgreementsTest.scala
index f5b1b23..a96702f 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/RoleAgreementsTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/RoleAgreementsTest.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.logic.test
 
 import org.junit.Assert._

diff --git a/src/test/scala/gr/grnet/aquarium/logic/test/TimeslotTest.scala b/src/test/scala/gr/grnet/aquarium/logic/test/TimeslotTest.scala
index e567a2d..a83c80d 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/logic/test/TimeslotTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/logic/test/TimeslotTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/messaging/AkkaAMQPTest.scala b/src/test/scala/gr/grnet/aquarium/messaging/AkkaAMQPTest.scala
index ca6025a..7d5968b 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/messaging/AkkaAMQPTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/messaging/AkkaAMQPTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/processor/actor/RemoteActorTest.scala b/src/test/scala/gr/grnet/aquarium/processor/actor/RemoteActorTest.scala
index a1cef9b..8aea06f 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/processor/actor/RemoteActorTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/processor/actor/RemoteActorTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala b/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala
index 13d1f18..0002de3 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/rest/actor/RESTActorTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/rest/actor/service/SprayPingServiceTest.scala b/src/test/scala/gr/grnet/aquarium/rest/actor/service/SprayPingServiceTest.scala
index 404ebf0..b1234eb 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/rest/actor/service/SprayPingServiceTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/rest/actor/service/SprayPingServiceTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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
@@ -47,10 +47,6 @@ import akka.actor.{Actor, PoisonPill}
 import org.slf4j.LoggerFactory
 import akka.config.{Config ⇒ AkkaConfig}
 
-/**
- * This class is heavily based on the Spray samples.
- * Copyright is what copyright Spray has.
- */
 class SprayPingService(_id: String = "spray-root-service") extends Actor {
   private[this] val logger = LoggerFactory.getLogger(getClass)
 

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 2e258eb..338e2c1 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * 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

diff --git a/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala b/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
index 17410e7..8731d86 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.user
 
 import gr.grnet.aquarium.Configurator

diff --git a/src/test/scala/gr/grnet/aquarium/util/TestMethods.scala b/src/test/scala/gr/grnet/aquarium/util/TestMethods.scala
index e27720c..ccf7975 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/util/TestMethods.scala
+++ b/src/test/scala/gr/grnet/aquarium/util/TestMethods.scala
@@ -1,3 +1,38 @@
+/*
+ * 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.util
 
 /*