More dead code removal

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/Accounts.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/Accounts.scala
deleted file mode 100644 (file)
index e040fd4..0000000
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/Accounts.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011 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
-
-import gr.grnet.aquarium.model._
-
-trait Accounts {
-
-  def addUserToGroup(u : User, g : Group) = {
-    DB.persist(g)
-  }
-
-
-  def addUserToOrg(u : User, o : Organization) = {
-    DB.persist(o)
-  }
-
-
-}
\ No newline at end of file

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/Bills.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/Bills.scala
deleted file mode 100644 (file)
index 51b9139..0000000
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/Bills.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2011 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
-
-import events.{EventProcessor, Event}
-import gr.grnet.aquarium.model._
-
-trait Bills {
-
-  def calcBills() = {
-    val entities = DB.findAll[Entity]("select e from Entity e")
-    //entities.foreach{x => calcBills(x)}
-  }
-
-  def calcBills(e: Entity) = {
-    EventProcessor.process(eventsFromDB(e))(f => true)
-  }
-
-  def eventsFromDB(e: Entity) : List[Event] = {
-    val events = List()
-    events
-  }
-}
\ No newline at end of file

diff --git a/logic/src/test/scala/gr/grnet/aquarium/logic/test/BillingTest.scala b/logic/src/test/scala/gr/grnet/aquarium/logic/test/BillingTest.scala
index b51c712..4d27543 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/logic/test/BillingTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/logic/test/BillingTest.scala
@@ -36,14 +36,13 @@
 package gr.grnet.aquarium.logic.test
 
 import org.junit._
-import gr.grnet.aquarium.logic.Bills
 import gr.grnet.aquarium.model.{User}
 import gr.grnet.aquarium.logic.accounting.{Agreement, AccountingEventType}
 
 import gr.grnet.aquarium.util.FixtureLoader
 
 class BillingTest
-  extends FixtureLoader with Bills {
+  extends FixtureLoader {
 
   def getDB = TestDB